diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index f544993e03..ce49cd2a00 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -668,7 +668,6 @@ Editor::Editor ()
 	set_snap_to (_snap_type);
 	_snap_mode = SnapOff;
 	set_snap_mode (_snap_mode);
-	previous_mouse_mode = MouseObject;
 	set_mouse_mode (MouseObject, true);
         pre_internal_mouse_mode = MouseObject;
         pre_internal_snap_type = _snap_type;
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 7d8ab924c9..d1639d819e 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -544,7 +544,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void set_samples_per_pixel (framecnt_t);
 
 	Editing::MouseMode mouse_mode;
-	Editing::MouseMode previous_mouse_mode;
 	Editing::MouseMode pre_internal_mouse_mode;
 	Editing::SnapType  pre_internal_snap_type;
 	Editing::SnapMode  pre_internal_snap_mode;
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 7a264e35de..dc84a6ea45 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -292,17 +292,8 @@ Editor::mouse_mode_toggled (MouseMode m)
 		_session->request_transport_speed (0.0, true);
 	}
 
-	if (mouse_mode == m) {
-		/* switch to the same mode, act like a toggle and switch back to previous mode */
-		Glib::RefPtr<Action>       pact  = get_mouse_mode_action(previous_mouse_mode);
-		Glib::RefPtr<ToggleAction> ptact = Glib::RefPtr<ToggleAction>::cast_dynamic(pact);
-		ptact->set_active(true);
-		return;
-	}
-
 	const bool was_internal = internal_editing();
 
-	previous_mouse_mode = mouse_mode;
 	mouse_mode = m;
 
 	if (!was_internal && internal_editing()) {