diff --git a/src/input/input.odin b/src/input/input.odin
index 4e1468b..54eb369 100644
--- a/src/input/input.odin
+++ b/src/input/input.odin
@@ -20,31 +20,6 @@ register_default_go_actions :: proc(input_map: ^core.InputActions) {
     }, "move to end of line");
 }
 
-register_default_panel_actions :: proc(input_map: ^core.InputActions) {
-    core.register_key_action(input_map, .H, proc(state: ^State) {
-        if current_panel, ok := state.current_panel.?; ok {
-            if prev, ok := util.get_prev(&state.panels, current_panel).?; ok {
-                state.current_panel = prev
-            }
-        }
-
-        core.reset_input_map(state)
-    }, "focus panel to the left");
-    core.register_key_action(input_map, .L, proc(state: ^State) {
-        if state.current_buffer < len(state.buffers)-1  {
-            state.current_buffer += 1
-        }
-
-        if current_panel, ok := state.current_panel.?; ok {
-            if next, ok := util.get_next(&state.panels, current_panel).?; ok {
-                state.current_panel = next
-            }
-        }
-
-        core.reset_input_map(state)
-    }, "focus panel to the right");
-}
-
 register_default_input_actions :: proc(input_map: ^core.InputActions) {
     // Cursor Movement
     {
@@ -106,10 +81,6 @@ register_default_input_actions :: proc(input_map: ^core.InputActions) {
         }
     }, "Save file")
 
-    // Panel Navigation
-    core.register_ctrl_key_action(input_map, .W, core.new_input_actions(), "Panel Navigation") 
-    register_default_panel_actions(&(&input_map.ctrl_key_actions[.W]).action.(core.InputActions))
-
     core.register_key_action(input_map, .G, core.new_input_actions(), "Go commands");
     register_default_go_actions(&(&input_map.key_actions[.G]).action.(core.InputActions));
 
diff --git a/src/panels/panels.odin b/src/panels/panels.odin
index b975972..5301dde 100644
--- a/src/panels/panels.odin
+++ b/src/panels/panels.odin
@@ -67,6 +67,38 @@ register_default_leader_actions :: proc(input_map: ^core.InputActions) {
     }, "Grep Workspace")
 }
 
+register_default_panel_actions :: proc(input_map: ^core.InputActions) {
+    core.register_key_action(input_map, .H, proc(state: ^core.State) {
+        if current_panel, ok := state.current_panel.?; ok {
+            if prev, ok := util.get_prev(&state.panels, current_panel).?; ok {
+                state.current_panel = prev
+            }
+        }
+
+        core.reset_input_map(state)
+    }, "focus panel to the left");
+    core.register_key_action(input_map, .L, proc(state: ^core.State) {
+        if state.current_buffer < len(state.buffers)-1  {
+            state.current_buffer += 1
+        }
+
+        if current_panel, ok := state.current_panel.?; ok {
+            if next, ok := util.get_next(&state.panels, current_panel).?; ok {
+                state.current_panel = next
+            }
+        }
+
+        core.reset_input_map(state)
+    }, "focus panel to the right");
+
+    core.register_key_action(input_map, .Q, proc(state: ^core.State) {
+        if current_panel, ok := state.current_panel.?; ok {
+            close(state, current_panel) 
+        }
+    }, "close panel")
+}
+
+
 open :: proc(state: ^core.State, panel: core.Panel, make_active: bool = true) -> (panel_id: int, ok: bool) {
     if panel_id, ok := util.append_static_list(&state.panels, panel).?; ok && make_active {
         state.current_panel = panel_id
@@ -104,6 +136,7 @@ open_file_buffer_in_new_panel :: proc(state: ^core.State, file_path: string, lin
     buffer.cursor.line = line
     buffer.cursor.col = col
     core.update_file_buffer_index_from_cursor(&buffer)
+    core.update_file_buffer_scroll(&buffer)
 
     buffer_index = len(state.buffers)
     runtime.append(&state.buffers, buffer);
@@ -191,6 +224,10 @@ make_file_buffer_panel :: proc(buffer_index: int) -> core.Panel {
     register_default_leader_actions(&leader_actions);
     core.register_key_action(&input_map.mode[.Normal], .SPACE, leader_actions, "leader commands");
 
+    core.register_ctrl_key_action(&input_map.mode[.Normal], .W, core.new_input_actions(), "Panel Navigation") 
+    register_default_panel_actions(&(&input_map.mode[.Normal].ctrl_key_actions[.W]).action.(core.InputActions))
+
+
     input.register_default_input_actions(&input_map.mode[.Normal]);
     input.register_default_visual_actions(&input_map.mode[.Visual]);
     input.register_default_text_input_actions(&input_map.mode[.Normal]);