diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index ea1e1ab088..47d466b58f 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2028,16 +2028,15 @@ ARDOUR_UI::transport_ffwd_rewind (bool fwd)
 
 			/* close to zero, maybe flip direction */
 
-			if (fwd) {
-				if (transport_speed <= 0) {
-					_session->request_transport_speed (1.0, false);
-					_session->request_roll (TRS_UI);
-				}
+			if (transport_speed != 0.0) {
+				_session->request_stop (TRS_UI);
 			} else {
-				if (transport_speed >= 0) {
+				if (fwd) {
+					_session->request_transport_speed (1.0, false);
+				} else {
 					_session->request_transport_speed (-1.0, false);
-					_session->request_roll (TRS_UI);
 				}
+				_session->request_roll (TRS_UI);
 			}
 
 			/* either we've just started, or we're moving as slowly as we