diff --git a/theme/boost/amd/build/loader.min.js b/theme/boost/amd/build/loader.min.js
index 04bc6a91813..d3adac7e361 100644
--- a/theme/boost/amd/build/loader.min.js
+++ b/theme/boost/amd/build/loader.min.js
@@ -1 +1 @@
-define(["jquery","./tether"],function(a,b){return window.jQuery=a,window.Tether=b,require(["theme_boost/util","theme_boost/alert","theme_boost/button","theme_boost/carousel","theme_boost/collapse","theme_boost/dropdown","theme_boost/modal","theme_boost/scrollspy","theme_boost/tab","theme_boost/tooltip","theme_boost/popover"],function(){a('[data-toggle="popover"]').popover()}),{}});
\ No newline at end of file
+define(["jquery","./tether"],function(a,b){return window.jQuery=a,window.Tether=b,require(["theme_boost/util","theme_boost/alert","theme_boost/button","theme_boost/carousel","theme_boost/collapse","theme_boost/dropdown","theme_boost/modal","theme_boost/scrollspy","theme_boost/tab","theme_boost/tooltip","theme_boost/popover"],function(){a("body").popover({selector:'[data-toggle="popover"]',trigger:"focus"})}),{}});
\ No newline at end of file
diff --git a/theme/boost/amd/src/loader.js b/theme/boost/amd/src/loader.js
index 99bce708444..cf908f83427 100644
--- a/theme/boost/amd/src/loader.js
+++ b/theme/boost/amd/src/loader.js
@@ -40,7 +40,10 @@ define(['jquery', './tether'], function(jQuery, Tether) {
             'theme_boost/tooltip',
             'theme_boost/popover'],
             function() {
-        jQuery('[data-toggle="popover"]').popover();
+                jQuery('body').popover({
+                    selector: '[data-toggle="popover"]',
+                    trigger: 'focus'
+                });
     });
 
     return {};
diff --git a/theme/boost/templates/core/filemanager_fileselect.mustache b/theme/boost/templates/core/filemanager_fileselect.mustache
index bd65dc7d1f2..ef9fcbc8e7a 100644
--- a/theme/boost/templates/core/filemanager_fileselect.mustache
+++ b/theme/boost/templates/core/filemanager_fileselect.mustache
@@ -7,7 +7,7 @@
             <button class="fp-file-download btn btn-secondary">{{#str}}download{{/str}}</button>
             <button class="fp-file-delete btn btn-secondary">{{#str}}delete{{/str}}</button>
             <button class="fp-file-setmain btn btn-secondary">{{#str}}setmainfile, repository{{/str}}</button>
-            <span class="fp-file-setmain-help btn btn-secondary">{{helpicon}}</span>
+            <span class="fp-file-setmain-help">{{{helpicon}}}</span>
             <button class="fp-file-zip btn btn-secondary">{{#str}}zip, editor{{/str}}</button>
             <button class="fp-file-unzip btn btn-secondary">{{#str}}unzip{{/str}}</button>
         </div>