2 files changed, 5 insertions, 1 deletions
diff --git a/assets/js/src/Dropdown.js b/assets/js/src/Dropdown.js
index 46652ba0..d97b925e 100644
--- a/assets/js/src/Dropdown.js
+++ b/assets/js/src/Dropdown.js
@@ -9,6 +9,10 @@ Kanboard.Dropdown.prototype.listen = function() {
         self.close();
     });
 
+    $(document).on('click', '#popover-content', function() {
+        self.close();
+    });
+
     $(document).on('click', '.dropdown-menu', function(e) {
         e.preventDefault();
         e.stopImmediatePropagation();
diff --git a/assets/js/src/Popover.js b/assets/js/src/Popover.js
index e32fce82..4c806278 100644
--- a/assets/js/src/Popover.js
+++ b/assets/js/src/Popover.js
@@ -137,7 +137,7 @@ Kanboard.Popover.prototype.afterOpen = function() {
     });
 
     // Autofocus fields (html5 autofocus works only with page onload)
-    $("[autofocus]").each(function() {
+    $("#popover-content input[autofocus]").each(function() {
         $(this).focus();
     });