diff --git a/build/js/IFrame.js b/build/js/IFrame.js
index 993d070f4..69946e313 100644
--- a/build/js/IFrame.js
+++ b/build/js/IFrame.js
@@ -191,7 +191,7 @@ class IFrame {
         $(SELECTOR_TAB_EMPTY).show()
       } else {
         const prevNavItemIndex = navItemIndex - 1
-        this.switchTab($navItemParent.children().eq(prevNavItemIndex).find('a'))
+        this.switchTab($navItemParent.children().eq(prevNavItemIndex).find('a.nav-link'))
       }
     } else {
       const $navItem = $(`${SELECTOR_TAB_NAVBAR_NAV_ITEM}.active`)
@@ -203,7 +203,7 @@ class IFrame {
         $(SELECTOR_TAB_EMPTY).show()
       } else {
         const prevNavItemIndex = navItemIndex - 1
-        this.switchTab($navItemParent.children().eq(prevNavItemIndex).find('a'))
+        this.switchTab($navItemParent.children().eq(prevNavItemIndex).find('a.nav-link'))
       }
     }
   }
diff --git a/build/scss/pages/_iframe.scss b/build/scss/pages/_iframe.scss
index 061c5ace5..98e14f7f7 100644
--- a/build/scss/pages/_iframe.scss
+++ b/build/scss/pages/_iframe.scss
@@ -28,6 +28,15 @@ body.iframe-mode-fullscreen {
       right: .125rem;
       top: .125rem;
       z-index: 10;
+      visibility: hidden;
+
+      &:hover,
+      &:focus {
+        animation-name: fadeIn;
+        animation-duration: $transition-speed;
+        animation-fill-mode: both;
+        visibility: visible;
+      }
     }
     .navbar-nav {
       overflow-y: auto;
@@ -38,6 +47,16 @@ body.iframe-mode-fullscreen {
       }
       .nav-item {
         position: relative;
+
+        &:hover,
+        &:focus {
+          .btn-iframe-close {
+            animation-name: fadeIn;
+            animation-duration: $transition-speed;
+            animation-fill-mode: both;
+            visibility: visible;
+          }
+        }
       }
     }
     .tab-content {