1 files changed, 8 insertions, 6 deletions
diff --git a/native/src/widget/pane_grid.rs b/native/src/widget/pane_grid.rs
index 2272d32c..e446b235 100644
--- a/native/src/widget/pane_grid.rs
+++ b/native/src/widget/pane_grid.rs
@@ -36,17 +36,19 @@ impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> {
         ) -> Element<'a, Message, Renderer>,
     ) -> Self {
         let elements = {
-            let focused_pane = state.internal.focused();
+            let action = state.internal.action();
+            let current_focus = action.focus();
 
             state
                 .panes
                 .iter_mut()
                 .map(move |(pane, pane_state)| {
-                    let focus = match focused_pane {
-                        state::FocusedPane::Some {
-                            pane: focused_pane,
-                            focus,
-                        } if *pane == focused_pane => Some(focus),
+                    let focus = match current_focus {
+                        Some((focused_pane, focus))
+                            if *pane == focused_pane =>
+                        {
+                            Some(focus)
+                        }
                         _ => None,
                     };