diff --git a/resources/themes/Blend of Gray/style.qss b/resources/themes/Blend of Gray/style.qss
index 684bc81869b..724ecfcb2ff 100644
--- a/resources/themes/Blend of Gray/style.qss	
+++ b/resources/themes/Blend of Gray/style.qss	
@@ -51,6 +51,8 @@ QAbstractSpinBox {
     border-radius: 0.2em;
     background-color: @darkgradient;
     color:@itembackground;
+    selection-background-color: @selection;
+    selection-color: @itemdarkbackground;
 }
 
 QAbstractSpinBox::up-button {
@@ -125,6 +127,8 @@ QLineEdit, QTextEdit, QPlainTextEdit
     border-radius: 0.2em;
     background-color:@itembackground;
     color:@text;
+    selection-background-color: @selection;
+    selection-color: @itemdarkbackground;
 }
 
 QPushButton 
@@ -198,6 +202,7 @@ QPushButton:pressed, QToolButton:pressed {
 
 QComboBox {
     selection-background-color: @selection;
+    selection-color: @itemdarkbackground;
     background-color: @darkgradient;
     color:@itembackground;
     border-style: solid;
@@ -221,6 +226,7 @@ QComboBox:on {
         stop: 0.9   #414141,
         stop: 1     #444);
     selection-background-color: @selection;
+    selection-color: @itemdarkbackground;
 }
 
 QComboBox:editable {
@@ -603,8 +609,8 @@ QAbstractItemView, QListView
   border: none;
   border-radius: 0.15em;
   padding: 1px;
-  selection-color: @text;
   selection-background-color: @selection;
+  selection-color: @itemdarkbackground;
 }
 
 QAbstractItemView::selected, QListView::selected {
diff --git a/resources/themes/Night Mapping/style.qss b/resources/themes/Night Mapping/style.qss
index 947f817e36e..2d192629713 100644
--- a/resources/themes/Night Mapping/style.qss	
+++ b/resources/themes/Night Mapping/style.qss	
@@ -51,6 +51,8 @@ QAbstractSpinBox {
     border-radius:0px;
     background-color: @darkgradient;
     color:@text;
+    selection-background-color: @selection;
+    selection-color: @text;
 }
 
 QAbstractSpinBox::up-button {
@@ -122,6 +124,8 @@ QLineEdit
     border: 1px solid #111;
     background-color: #888;
     color: #111;
+    selection-background-color: @selection;
+    selection-color: @text;
 }
 
 QTextEdit, QPlainTextEdit
@@ -133,6 +137,8 @@ QTextEdit, QPlainTextEdit
     border-radius: 0px;
     background-color:@itembackground;
     color:@text;
+    selection-background-color: @selection;
+    selection-color: @text;
 }
 
 QPushButton 
@@ -205,6 +211,7 @@ QPushButton:pressed, QToolButton:pressed {
 
 QComboBox {
     selection-background-color: @selection;
+    selection-color: @text;
     background-color: @darkgradient;
     color:@text;
     border-style: solid;
@@ -228,6 +235,7 @@ QComboBox:on {
         stop: 0.9   #414141,
         stop: 1     #444);
     selection-background-color: @selection;
+    selection-color: @text;
 }
 
 QComboBox:editable {
@@ -237,6 +245,8 @@ QComboBox:editable QLineEdit {
     border-color: @itemdarkbackground;
     background-color: @itemdarkbackground;
     color:@text;
+    selection-background-color: @selection;
+    selection-color: @text;
 }
 
 QComboBox QAbstractItemView, QComboBox QListView {