diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
index cc15494cf..cecc3a782 100644
--- a/platform/firefox/vapi-background.js
+++ b/platform/firefox/vapi-background.js
@@ -917,7 +917,7 @@ var httpObserver = {
             }
 
             try {
-                // [tabId, type, sourceTabId - given if it was a popup]
+                // [type, tabId, sourceTabId - given if it was a popup]
                 channelData = channel.getProperty(location.host + 'reqdata');
             } catch (ex) {
                 return;
diff --git a/src/css/common.css b/src/css/common.css
index fb4303e30..1ea1dd0c0 100644
--- a/src/css/common.css
+++ b/src/css/common.css
@@ -18,7 +18,7 @@
     cursor: pointer;
     position: relative;
     }
-body:not(.advancedUser) [data-tip]:hover:after {
+body:not(.advancedUser) [data-tip]:after {
     background-color: #ffffee;
     border: 1px solid gray;
     border-radius: 3px;
@@ -36,13 +36,12 @@ body:not(.advancedUser) [data-tip]:hover:after {
     white-space: pre-line;
     z-index: 20;
     pointer-events: none;
-    animation: tooltip 0.8s;
-    -webkit-animation: tooltip 0.8s;
+    opacity: 0;
     }
-[data-tip]:hover::after {
-    opacity: 1;
-    -webkit-transition: opacity 0.2s 0.2s;
-    transition: opacity 0.2s 0.2s;
+[data-tip]:hover:after {
+    opacity: 1 !important;
+    -webkit-transition: opacity 0.2s 0.4s;
+    transition: opacity 0.2s 0.4s;
     }
 body[dir=rtl] [data-tip]:hover:after {
     text-align: right;
@@ -61,17 +60,6 @@ body[dir=rtl] [data-tip][data-tip-anchor="top"]:hover:after {
     right: -500%;
     }
 
-@keyframes tooltip {
-      0% { opacity: 0; }
-     85% { opacity: 0; }
-    100% { opacity: 1; }
-    }
-@-webkit-keyframes tooltip {
-      0% { opacity: 0; }
-     85% { opacity: 0; }
-    100% { opacity: 1; }
-    }
-
 .hiddenFileInput {
     visibility: hidden;
     width: 0;
diff --git a/src/css/popup.css b/src/css/popup.css
index a7dc6bdcd..5edd1b5b2 100644
--- a/src/css/popup.css
+++ b/src/css/popup.css
@@ -6,6 +6,7 @@ body {
     margin: 0;
     padding: 0;
     white-space: nowrap;
+    overflow: hidden;
     }
 h1,h2,h3,h4 {
     background-color: #444;