diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index eb35240364..ed4cd8fe65 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -576,11 +576,6 @@ int VideoDriver_SDL::PollEvent()
 					_right_button_clicked = true;
 					_right_button_down_pos.x = ev.motion.x;
 					_right_button_down_pos.y = ev.motion.y;
-#ifdef __ANDROID__
-					// Right button click on Android - cancel whatever action we were doing
-					ResetObjectToPlace();
-					ToolbarSelectLastTool();
-#endif
 					break;
 
 #ifdef __ANDROID__
diff --git a/src/window.cpp b/src/window.cpp
index a7dbdac9c9..aef4a9e120 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -3244,6 +3244,11 @@ void HandleMouseEvents()
 		_right_button_clicked = false;
 		click = MC_RIGHT;
 		_input_events_this_tick++;
+#if defined(__ANDROID__) || 1
+		// Two-finger touch on Android - cancel whatever action we were doing
+		ResetObjectToPlace();
+		ToolbarSelectLastTool();
+#endif
 	} else if(!_left_button_down && !left_button_released) {
 		click = MC_LEFT_UP;
 		left_button_released = true;