1 files changed, 3 insertions, 5 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index a50d1ba..30cc4d3 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1131,13 +1131,11 @@ void BScreen::changeWorkspaceID(unsigned int id) {
 
     currentWorkspace()->showAll();
 
-    if (focused && focused->isMoving())
+    if (focused && focused->isMoving()) {
         focused->setInputFocus();
-    else
-        FocusControl::revertFocus(*this);
-
-    if (focused && focused->isMoving())
         focused->resumeMoving();
+    } else
+        FocusControl::revertFocus(*this);
 
     updateNetizenCurrentWorkspace();
     FbTk::App::instance()->sync(false);