diff --git a/src/shell/workspace.rs b/src/shell/workspace.rs
index 67a4beaf..fd6d14ff 100644
--- a/src/shell/workspace.rs
+++ b/src/shell/workspace.rs
@@ -605,6 +605,7 @@ impl Workspace {
 
         if let Some(pos) = self.minimized_windows.iter().position(|m| m == mapped) {
             let state = self.minimized_windows.remove(pos);
+            mapped.set_minimized(false);
             return Some(match state {
                 MinimizedWindow::Floating { previous, .. } => {
                     WorkspaceRestoreData::Floating(Some(previous))
@@ -670,6 +671,7 @@ impl Workspace {
                 unreachable!()
             };
 
+            surface.set_minimized(false);
             return Some((surface, WorkspaceRestoreData::Fullscreen(previous)));
         }