diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 1b5ff4a5..9b4827c9 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -589,7 +589,7 @@ void CKeybindManager::changeworkspace(std::string args) {
         if (!*PALLOWWORKSPACECYCLES)
             PCURRENTWORKSPACE->m_iPrevWorkspaceID = -1;
         
-    } else if (PCURRENTWORKSPACE->m_iID == workspaceToChangeTo)
+    } else if (PCURRENTWORKSPACE->m_iID == workspaceToChangeTo && !internal)
         return;
 
     // remove constraints 
@@ -840,10 +840,10 @@ void CKeybindManager::moveActiveToWorkspace(std::string args) {
 
         for (auto& m : g_pCompositor->m_vMonitors)
             m->specialWorkspaceOpen = false;
+    } else {
+        g_pCompositor->focusWindow(PWINDOW);
     }
 
-    g_pCompositor->focusWindow(PWINDOW);
-
     PWINDOW->updateToplevel();
 }