diff --git a/ChangeLog b/ChangeLog
index 7d4d209d..e3c30e8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Changes for 0.9.16:
 *06/03/27:
    * Fix crash when deiconifying stuck windows with Follow mode (Simon)
      IconButton.cc
+   * Don't Follow stuck windows on deiconify, since they're stuck 
+     (thanks _markt)
+     IconButton.cc
 *06/03/26:
    * Related to external (Simon)
      - Fix title alignment
diff --git a/src/IconButton.cc b/src/IconButton.cc
index edc2fc10..770944fe 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -91,7 +91,8 @@ public:
                 break;
             case IconbarTool::FOLLOW:
             default:
-                win.screen().changeWorkspaceID(win.workspaceNumber());
+                if (!win.isStuck())
+                    win.screen().changeWorkspaceID(win.workspaceNumber());
                 break;
             };
             win.raiseAndFocus();