diff --git a/src/web/HTMLOperation.js b/src/web/HTMLOperation.js
index ea0d4397..499faab5 100755
--- a/src/web/HTMLOperation.js
+++ b/src/web/HTMLOperation.js
@@ -51,7 +51,7 @@ HTMLOperation.prototype.toStubHtml = function(removeIcon) {
 
     if (this.description) {
         html += " data-container='body' data-toggle='popover' data-placement='auto right'\
-            data-content=\"" + this.description + "\" data-html='true' data-trigger='hover'";
+            data-content=\"" + this.description + "\" data-html='true' data-trigger='focus' tabindex='0'";
     }
 
     html += ">" + this.name;
diff --git a/src/web/stylesheets/utils/_overrides.css b/src/web/stylesheets/utils/_overrides.css
index 8957071a..e060db7d 100755
--- a/src/web/stylesheets/utils/_overrides.css
+++ b/src/web/stylesheets/utils/_overrides.css
@@ -140,6 +140,8 @@ optgroup {
 .popover {
     background-color: var(--popover-background);
     border-color: var(--popover-border-colour);
+    max-height: 100%;
+    overflow-y: auto;
 }