diff --git a/assets/js/general_functions.js b/assets/js/general_functions.js
index 23155942..8e82848a 100755
--- a/assets/js/general_functions.js
+++ b/assets/js/general_functions.js
@@ -264,7 +264,9 @@ window.GeneralFunctions = window.GeneralFunctions || {};
             trigger: 'manual'
         });
 
-        $element.on('click', function () {
+        $element.on('click', function (event) {
+            event.stopPropagation();
+
             if ($('#language-list').length === 0) {
                 $(this).popover('show');
             } else {
@@ -289,6 +291,10 @@ window.GeneralFunctions = window.GeneralFunctions || {};
                 })
                 .fail(GeneralFunctions.ajaxFailureHandler);
         });
+
+        $(document).on('click', function() {
+            $element.popover('hide');
+        });
     };
 
     /**