diff --git a/src/viewport.cpp b/src/viewport.cpp
index ef6a2761db..451d87110d 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1811,7 +1811,10 @@ bool HandleViewportClicked(const ViewPort *vp, int x, int y)
 		if (v != NULL && VehicleClicked(v)) return true;
 	}
 
-	if (_thd.place_mode & HT_DRAG_MASK) return false;
+	if (_thd.place_mode & HT_DRAG_MASK) {
+		PlaceObject();
+		return true;
+	}
 
 	if (CheckClickOnTown(vp, x, y)) return true;
 	if (CheckClickOnStation(vp, x, y)) return true;
diff --git a/src/window.cpp b/src/window.cpp
index 7ef758a63e..49039ec15a 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2209,8 +2209,6 @@ static void MouseLoop(MouseClick click, int mousewheel)
 						_settings_client.gui.left_mouse_btn_scrolling) {
 					_scrolling_viewport = true;
 					_cursor.fix_at = false;
-				} else {
-					PlaceObject();
 				}
 				break;