diff --git a/less/forms.less b/less/forms.less
index fe5396cd1d..c79f7f6733 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -64,9 +64,14 @@ input[type="color"] {
   background-color: @input-bg;
   border: 1px solid @input-border;
   border-radius: @input-border-radius;
-  outline: 0;
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
   .transition(~"border-color linear .2s, box-shadow linear .2s");
+
+  &:focus {
+    border-color: rgba(82,168,236,.8);
+    outline: 0;
+    .box-shadow(0 0 8px rgba(82,168,236,.6));
+  }
 }
 
 // Reset appearance properties for textual inputs and textarea
@@ -98,32 +103,6 @@ textarea {
   height: auto;
 }
 
-// Everything else
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"] {
-  // Focus state
-  &:focus {
-    border-color: rgba(82,168,236,.8);
-    outline: 0;
-    outline: thin dotted \9; /* IE6-9 */
-    //.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
-    .box-shadow(0 0 8px rgba(82,168,236,.6));
-  }
-}
-
 // Position radios and checkboxes better
 input[type="radio"],
 input[type="checkbox"] {
@@ -146,7 +125,6 @@ select[size] {
 }
 
 // Focus for select, file, radio, and checkbox
-select:focus,
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {