diff --git a/client/src/pages/admin/admin/state.rs b/client/src/pages/admin/admin/state.rs
index ef642c5..5d4d384 100644
--- a/client/src/pages/admin/admin/state.rs
+++ b/client/src/pages/admin/admin/state.rs
@@ -1,7 +1,6 @@
 // src/pages/admin/admin/state.rs
 use ratatui::widgets::ListState;
 use crate::pages::admin_panel::add_table::state::AddTableState;
-use crate::pages::admin_panel::add_logic::state::AddLogicState;
 use crate::movement::{move_focus, MovementAction};
 use crate::state::app::state::AppState;
 
@@ -28,7 +27,6 @@ pub struct AdminState {
     pub selected_table_index: Option<usize>,
     pub current_focus: AdminFocus,
     pub add_table_state: AddTableState,
-    pub add_logic_state: AddLogicState,
 }
 
 impl AdminState {
diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs
index 480ca1e..78dac5a 100644
--- a/client/src/ui/handlers/ui.rs
+++ b/client/src/ui/handlers/ui.rs
@@ -426,15 +426,9 @@ pub async fn run_ui() -> Result<()> {
                 }
                 AppView::AddTable => router.navigate(Page::AddTable(admin_state.add_table_state.clone())),
                 AppView::AddLogic => {
-                    // Create once, like Login/Register
-                    if let Page::AddLogic(_) = &router.current {
-                        // already on page
-                    } else {
-                        let mut page = add_logic::state::AddLogicFormState::from_state(
-                            admin_state.add_logic_state.clone(),
-                        );
+                    if let Page::AddLogic(page) = &mut router.current {
+                        // Ensure keymap is set once
                         page.editor.set_keymap(config.build_canvas_keymap());
-                        router.navigate(Page::AddLogic(page));
                     }
                 }
                 AppView::Form(path) => {