2 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ef710e..9959509 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
+*07/03/17:
+   * Iconified, stuck windows weren't being moved to different workspaces (Mark)
+     Screen.cc
 *07/03/16:
    * Maximizing a window with aspect ratio requirements was making windows too
      large (thanks Tomas Janousek)
diff --git a/src/Screen.cc b/src/Screen.cc
index 44171be..3ef27a6 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1175,6 +1175,13 @@ void BScreen::changeWorkspaceID(unsigned int id) {
         }
     }
 
+    // change workspace ID of stuck iconified windows, too
+    Icons::iterator icon_it = iconList().begin();
+    for (; icon_it != iconList().end(); ++icon_it) {
+        if ((*icon_it)->isStuck())
+            (*icon_it)->setWorkspace(id);
+    }
+
     currentWorkspace()->hideAll(false);
 
     // set new workspace