diff --git a/src/Explorer/Panes/Tables/AddTableEntityPane.ts b/src/Explorer/Panes/Tables/AddTableEntityPane.ts
index 9e4825d45..11561b1c1 100644
--- a/src/Explorer/Panes/Tables/AddTableEntityPane.ts
+++ b/src/Explorer/Panes/Tables/AddTableEntityPane.ts
@@ -69,6 +69,7 @@ export default class AddTableEntityPane extends TableEntityPane {
           );
           this.updateIsActionEnabled();
           super.open();
+          this.focusValueElement();
         });
     } else {
       this.displayedAttributes(
@@ -79,8 +80,12 @@ export default class AddTableEntityPane extends TableEntityPane {
       );
       this.updateIsActionEnabled();
       super.open();
+      this.focusValueElement();
     }
-    const focusElement = document.getElementById("closeAddEntityPane");
+  }
+
+  private focusValueElement() {
+    const focusElement = document.getElementById("addTableEntityValue");
     focusElement && focusElement.focus();
   }