diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ae0dea302..f4c21b05c 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2525,6 +2525,7 @@ define([
         window.setTimeout(function () {
             modal.show();
             $modal.focus();
+            next();
         });
     };
 
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 135b0eae0..db2811fff 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -990,6 +990,9 @@ define([
         // Arrow keys to modify the selection
         var onWindowKeydown = function (e) {
             if (!$content.is(':visible')) { return; }
+            if ($('.cp-modal').is(':visible')) {
+                return;
+            }
             var $searchBar = $tree.find('#cp-app-drive-tree-search-input');
             if (document.activeElement && document.activeElement.nodeName === 'INPUT') { return; }
             if ($searchBar.is(':focus') && $searchBar.val()) { return; }