diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index b3946cd66..0ca36bb5d 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -2899,6 +2899,7 @@ export const AppFolderDialog = GObject.registerClass({
 
         this._isOpen = this._grabHelper.grab({
             actor: this,
+            focus: this._editButton,
             onUngrab: () => this.popdown(),
         });