diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 1fb22b20ed..a984f6129e 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -354,7 +354,6 @@ Editor::Editor ()
 	no_region_list_redisplay = false;
 	resize_idle_id = -1;
 
-	_scrubbing = false;
 	scrubbing_direction = 0;
 
 	sfbrowser = 0;
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index f2b21a020e..c96e3768d7 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1364,7 +1364,6 @@ class Editor : public PublicEditor
 	void start_scrolling ();
 	void stop_scrolling ();
 
-	bool _scrubbing;
 	double last_scrub_x;
 	int scrubbing_direction;
 	int scrub_reversals;
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index ec8d0a81e0..baa9d1aa45 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1369,7 +1369,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 			break;
 			
 		case MouseAudition:
-			_scrubbing = false;
 			track_canvas->get_window()->set_cursor (*current_canvas_cursor);
 			if (scrubbing_direction == 0) {
 				/* no drag, just a click */
@@ -1465,7 +1464,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 
 			fraction = 1.0 - (cp->get_y() / cp->line().height());
 
-			if (is_drawable() && !_scrubbing) {
+			if (is_drawable() && dynamic_cast<ScrubDrag*> (_drag) == 0) {
 			        track_canvas->get_window()->set_cursor (*fader_cursor);
 			}