diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c
index 28d47877..90db8c77 100644
--- a/src/raddbg/raddbg_core.c
+++ b/src/raddbg/raddbg_core.c
@@ -5759,6 +5759,13 @@ rd_window_frame(void)
   ws->window_temporarily_focused_ipc = 0;
   ui_select_state(ws->ui);
   
+  //////////////////////////////
+  //- rjf: @window_frame_part fill panel/view interaction registers
+  //
+  rd_regs()->panel = panel_tree.focused->cfg->id;
+  rd_regs()->tab   = panel_tree.focused->selected_tab->id;
+  rd_regs()->view = panel_tree.focused->selected_tab->id;
+  
   //////////////////////////////
   //- rjf: @window_frame_part compute window's theme
   //
@@ -6024,13 +6031,6 @@ rd_window_frame(void)
     scratch_end(scratch);
   }
   
-  //////////////////////////////
-  //- rjf: @window_frame_part fill panel/view interaction registers
-  //
-  rd_regs()->panel = panel_tree.focused->cfg->id;
-  rd_regs()->tab   = panel_tree.focused->selected_tab->id;
-  rd_regs()->view = panel_tree.focused->selected_tab->id;
-  
   //////////////////////////////
   //- rjf: @window_frame_part build UI
   //