2 files changed, 4 insertions, 0 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 83a864b..013b6c6 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -953,6 +953,7 @@ void BScreen::changeWorkspaceID(unsigned int id, bool revert) {
     this->focusControl().ignoreAtPointer();
 
     FbTk::App::instance()->sync(false);
+    XGrabServer(Fluxbox::instance()->display());
 
     FluxboxWindow *focused = FocusControl::focusedFbWindow();
 
@@ -990,6 +991,7 @@ void BScreen::changeWorkspaceID(unsigned int id, bool revert) {
 
     old->hideAll(false);
 
+    XUngrabServer(Fluxbox::instance()->display());
     FbTk::App::instance()->sync(false);
 
     m_currentworkspace_sig.emit(*this);
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index a642008..6422c3f 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -602,6 +602,7 @@ void ShowDesktopCmd::execute() {
                                            it_end = wins.end();
     unsigned int space = screen->currentWorkspaceID();
     unsigned int count = 0;
+    XGrabServer(Fluxbox::instance()->display());
     for (; it != it_end; ++it) {
         if (!(*it)->fbwindow()->isIconic() && ((*it)->fbwindow()->isStuck() ||
             (*it)->fbwindow()->workspaceNumber() == space) &&
@@ -621,6 +622,7 @@ void ShowDesktopCmd::execute() {
         }
     } else
         FocusControl::revertFocus(*screen);
+    XUngrabServer(Fluxbox::instance()->display());
 
 }