diff --git a/src/desktop.c b/src/desktop.c
index 7210712c..1a136ca4 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -176,6 +176,9 @@ void ChangeDesktop(unsigned int desktop)
          }
          if(np->state.desktop == currentDesktop) {
             HideClient(np);
+            if((np->state.status & STAT_MINIMIZED) && (np->state.status & STAT_ACTIVE)) {
+               np->state.status &= ~STAT_ACTIVE;
+            }
          }
       }
    }