diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css
index 65b496617..36f28a51a 100644
--- a/data/themes/classic/style.css
+++ b/data/themes/classic/style.css
@@ -34,8 +34,6 @@ QLineEdit {
 	border-radius: 4px;
 	border: 2px inset rgba(91,101,113,128);
 	background: #49515b;
-	color: #e0e0e0;
-	selection-background-color: #202020;
 }
 
 
@@ -50,6 +48,13 @@ QLineEdit:focus {
 	border: 1px solid rgba(0,0,0, 128);
 }
 
+/* Set color and selection background color for various inputs.
+   SpinBoxes are used in QInputDialogs */
+
+QTextEdit, QLineEdit:focus, QComboBox:focus, QSpinBox:focus, QDoubleSpinBox:focus {
+	color: #e0e0e0;
+	selection-background-color: #202020;
+}
 
 QToolTip {
 	border-radius: 4px;
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index 832da176f..03de62023 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -61,8 +61,6 @@ QLineEdit {
 	border-radius: 4px;
 	border: 1px;
 	background: #101213;
-	color: #d1d8e4;
-	selection-background-color: #17793b;
 }
 
 QLineEdit:read-only {
@@ -76,6 +74,13 @@ QLineEdit:focus {
 	border: 1px solid #0bd556;
 }
 
+/* Set color and selection background color for various inputs.
+   SpinBoxes are used in QInputDialogs */
+
+QTextEdit, QLineEdit:focus, QComboBox:focus, QSpinBox:focus, QDoubleSpinBox:focus {
+	color: #d1d8e4;
+	selection-background-color: #17793b;
+}
 
 QToolTip {
 	border-radius: 4px;