diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 13b0461b6..cd907bea6 100755
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -105,10 +105,10 @@ Main =
     $.addClass doc, if chrome? then 'blink' else 'gecko'
     $.addStyle Main.css, 'fourchanx-css'
 
-    mouse = false
-    $.on d, 'mousedown', -> mouse = true
-    $.on d, 'keydown',   -> mouse = false
-    window.addEventListener 'focus', (-> doc.classList.toggle 'mouse-focus', mouse), true
+    keyboard = false
+    $.on d, 'mousedown', -> keyboard = false
+    $.on d, 'keydown', (e) -> keyboard = true if e.keyCode is 9 # tab
+    window.addEventListener 'focus', (-> doc.classList.toggle 'keyboard-focus', keyboard), true
 
     Main.setClass()
 
diff --git a/src/General/css/style.css b/src/General/css/style.css
index 84ea4830c..724b4e886 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -64,7 +64,7 @@ a[href="javascript:;"] {
 body.hasDropDownNav{
   margin-top: 5px;
 }
-:root.mouse-focus a {
+:root:not(.keyboard-focus) a {
   outline: none;
 }
 .painted {