1 files changed, 11 insertions, 3 deletions

diff --git a/src/Window.cc b/src/Window.cc
index 0db3b80..6a12664 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1415,9 +1415,17 @@ void FluxboxWindow::deiconify(bool reassoc, bool do_raise) {
     if (oplock) return;
     oplock = true;
 
-    if (iconic || reassoc) {
-        screen().reassociateWindow(this, screen().currentWorkspace()->workspaceID(), false);
-    } else if (moving || m_workspace_number != screen().currentWorkspace()->workspaceID()) {
+    if (iconic &&
+        m_workspace_number != screen().currentWorkspace()->workspaceID()) {
+        // reassociate first, so it gets removed from screen's icon list
+        screen().reassociateWindow(this, m_workspace_number, false);
+        iconic = false;
+        return;
+    }
+
+    if (iconic || reassoc)
+        screen().reassociateWindow(this, screen().currentWorkspaceID(), false);
+    else if (moving || m_workspace_number != screen().currentWorkspaceID()) {
         oplock = false;
         return;
     }