diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 1b372254..d9feb6a7 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -3130,7 +3130,7 @@ impl Shell {
         let is_minimized = window.is_minimized();
         let is_fullscreen = from_workspace.get_fullscreen().is_some_and(|f| f == window);
         let mut window_state = if is_fullscreen {
-            let (previous_state, previous_geometry) = from_workspace.take_fullscreen().unwrap();
+            let (_, previous_state, previous_geometry) = from_workspace.take_fullscreen().unwrap();
             WorkspaceRestoreData::Fullscreen(previous_state.zip(previous_geometry).map(
                 |(previous_state, previous_geometry)| FullscreenRestoreData {
                     previous_state,
diff --git a/src/shell/workspace.rs b/src/shell/workspace.rs
index c8d9151c..5a535145 100644
--- a/src/shell/workspace.rs
+++ b/src/shell/workspace.rs
@@ -1239,6 +1239,7 @@ impl Workspace {
     pub fn take_fullscreen(
         &mut self,
     ) -> Option<(
+        CosmicSurface,
         Option<FullscreenRestoreState>,
         Option<Rectangle<i32, Local>>,
     )> {
@@ -1248,7 +1249,11 @@ impl Workspace {
             focus_stack.retain(|t| t != &surface.surface);
         }
 
-        Some((surface.previous_state, surface.previous_geometry))
+        Some((
+            surface.surface,
+            surface.previous_state,
+            surface.previous_geometry,
+        ))
     }
 
     #[must_use]