diff --git a/js/core.js b/js/core.js
index 4a3472b4..338ce194 100644
--- a/js/core.js
+++ b/js/core.js
@@ -550,6 +550,11 @@ define([
             });
             e.stopPropagation();
         });
+        
+        // Avoid dropdown panels to close on click
+        $("div.dropdown-menu").click(function(e) {
+            e.stopPropagation();
+        });
 
     });
 
diff --git a/js/extensions/buttonShare.js b/js/extensions/buttonShare.js
index 811834c9..a1b1f210 100644
--- a/js/extensions/buttonShare.js
+++ b/js/extensions/buttonShare.js
@@ -28,9 +28,6 @@ define([
                 var lineElement = $(_.template(buttonShareLocationHTML, {
                     link: attributes.sharingLink
                 }));
-                lineElement.click(function(event) {
-                    event.stopPropagation();
-                });
                 linkList.append(lineElement);
                 $("#link-container .no-link").hide();
             }