2 files changed, 5 insertions, 0 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 1205d79..ff44f14 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1535,6 +1535,7 @@ void BScreen::setLayer(FbTk::LayerItem &item, int layernum) {
  Goes to the workspace "right" of the current
 */
 void BScreen::nextWorkspace(int delta) {
+    focusControl().stopCyclingFocus();
     if (delta)
         changeWorkspaceID( (currentWorkspaceID() + delta) % numberOfWorkspaces());
     else if (m_former_workspace)
@@ -1545,6 +1546,7 @@ void BScreen::nextWorkspace(int delta) {
  Goes to the workspace "left" of the current
 */
 void BScreen::prevWorkspace(int delta) {
+    focusControl().stopCyclingFocus();
     if (delta)
         changeWorkspaceID( (static_cast<signed>(numberOfWorkspaces()) + currentWorkspaceID() - (delta % numberOfWorkspaces())) % numberOfWorkspaces());
     else if (m_former_workspace)
@@ -1555,6 +1557,7 @@ void BScreen::prevWorkspace(int delta) {
  Goes to the workspace "right" of the current
 */
 void BScreen::rightWorkspace(int delta) {
+    focusControl().stopCyclingFocus();
     if (currentWorkspaceID()+delta < numberOfWorkspaces())
         changeWorkspaceID(currentWorkspaceID()+delta);
 }
@@ -1563,6 +1566,7 @@ void BScreen::rightWorkspace(int delta) {
  Goes to the workspace "left" of the current
 */
 void BScreen::leftWorkspace(int delta) {
+    focusControl().stopCyclingFocus();
     if (currentWorkspaceID() >= static_cast<unsigned int>(delta))
         changeWorkspaceID(currentWorkspaceID()-delta);
 }
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index bca56c6..6d18b73 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -383,6 +383,7 @@ JumpToWorkspaceCmd::JumpToWorkspaceCmd(int workspace_num):m_workspace_num(worksp
 void JumpToWorkspaceCmd::execute() {
     BScreen *screen = Fluxbox::instance()->mouseScreen();
     if (screen != 0) {
+        screen->focusControl().stopCyclingFocus();
         int num = screen->numberOfWorkspaces();
         int actual = m_workspace_num;
         // we need an extra +1, since it's subtracted in FbCommandFactory