1 files changed, 2 insertions, 2 deletions
diff --git a/assets/js/src/Popover.js b/assets/js/src/Popover.js
index 6420f9ad..f858a022 100644
--- a/assets/js/src/Popover.js
+++ b/assets/js/src/Popover.js
@@ -55,7 +55,7 @@ Popover.prototype.listen = function() {
 
 Popover.prototype.afterOpen = function() {
     var self = this;
-    var popoverForm = $(".popover-form");
+    var popoverForm = $("#popover-content .popover-form");
 
     // Submit forms with Ajax request
     if (popoverForm) {
@@ -95,7 +95,7 @@ Popover.prototype.afterSubmit = function(data, request, self) {
     }
     else {
         $("#popover-content").html(data);
-        $("input[autofocus]").focus();
+        $("#popover-content input[autofocus]").focus();
         self.afterOpen();
     }
 };