diff --git a/js/h5p.js b/js/h5p.js
index 157ab67..aed2cfd 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -363,6 +363,24 @@ H5P.init = function (target) {
 
     // Resize content.
     H5P.trigger(instance, 'resize');
+
+    // Logic for hiding focus effects when using mouse
+    const wrapper = $element[0];
+    wrapper.classList.add('using-mouse');
+
+    // Switch between focus modes
+    wrapper.addEventListener('mousedown', function () {
+      wrapper.classList.add('using-mouse');
+    });
+
+    wrapper.addEventListener('keydown', function () {
+      wrapper.classList.remove('using-mouse');
+    });
+
+    // Make sure using-mouse is removed on the first tab into content as well
+    wrapper.addEventListener('keyup', function () {
+      wrapper.classList.remove('using-mouse');
+    });
   });
 
   // Insert H5Ps that should be in iframes.
@@ -1028,12 +1046,16 @@ H5P.Dialog = function (name, title, content, $element) {
                               </div>\
                             </div>')
     .insertAfter($element)
-    .click(function () {
+    .click(function (e) {
+      if (e && e.originalEvent && e.originalEvent.preventClosing) {
+        return;
+      }
+
       self.close();
     })
     .children('.h5p-inner')
-      .click(function () {
-        return false;
+      .click(function (e) {
+        e.originalEvent.preventClosing = true;
       })
       .find('.h5p-close')
         .click(function () {
diff --git a/styles/h5p.css b/styles/h5p.css
index 5a50326..9bde50a 100644
--- a/styles/h5p.css
+++ b/styles/h5p.css
@@ -560,3 +560,7 @@ iframe.h5peditor-semi-fullscreen {
   background: #fff;
   z-index: 100001;
 }
+
+.h5p-content.using-mouse *:focus {
+  outline: none !important;
+}
\ No newline at end of file