# HG changeset patch
# Parent 3a6e4d518ac5fc68f8783851791d1081d2fdb7e6

diff -r 3a6e4d518ac5 src/order_gui.cpp
--- a/src/order_gui.cpp	Wed Oct 09 18:25:02 2013 +0200
+++ b/src/order_gui.cpp	Wed Oct 09 18:25:05 2013 +0200
@@ -644,7 +644,6 @@
 	 */
 	void OrderClick_Conditional()
 	{
-		this->LowerWidget(WID_O_GOTO);
 		this->SetWidgetDirty(WID_O_GOTO);
 		SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, PAL_NONE, HT_NONE, this);
 		this->goto_type = OPOS_CONDITIONAL;
@@ -655,7 +654,6 @@
 	 */
 	void OrderClick_Share()
 	{
-		this->LowerWidget(WID_O_GOTO);
 		this->SetWidgetDirty(WID_O_GOTO);
 		SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, PAL_NONE, HT_VEHICLE, this);
 		this->goto_type = OPOS_SHARE;
@@ -1111,7 +1109,11 @@
 
 	virtual void OnPaint()
 	{
-		if (this->vehicle->owner != _local_company) this->selected_order = -1; // Disable selection any selected row at a competitor order window.
+		if (this->vehicle->owner != _local_company) {
+			this->selected_order = -1; // Disable selection any selected row at a competitor order window.
+		} else {
+			this->SetWidgetLoweredState(WID_O_GOTO, this->goto_type != OPOS_NONE);
+		}
 		this->DrawWidgets();
 	}
 
@@ -1501,7 +1503,6 @@
 	virtual void OnPlaceObjectAbort()
 	{
 		this->goto_type = OPOS_NONE;
-		this->RaiseWidget(WID_O_GOTO);
 		this->SetWidgetDirty(WID_O_GOTO);
 
 		/* Remove drag highlighting if it exists. */