diff --git a/src/main/java/com/kfmanager/ui/MainWindow.java b/src/main/java/com/kfmanager/ui/MainWindow.java
index 89765d7..4fb0fd1 100644
--- a/src/main/java/com/kfmanager/ui/MainWindow.java
+++ b/src/main/java/com/kfmanager/ui/MainWindow.java
@@ -1256,6 +1256,7 @@ public class MainWindow extends JFrame {
 
     private void executeCommand(String command) {
         if (command == null || command.trim().isEmpty()) {
+            activePanel.getFileTable().requestFocusInWindow();
             return;
         }
 
@@ -1310,6 +1311,7 @@ public class MainWindow extends JFrame {
                 pb.directory(currentDir);
                 pb.start();
                 commandLine.setText(""); // Clear after execution
+                activePanel.getFileTable().requestFocusInWindow();
             }
 
         } catch (Exception e) {