diff --git a/resources/qml/MatrixTextField.qml b/resources/qml/MatrixTextField.qml
index 2852044b..037a0b71 100644
--- a/resources/qml/MatrixTextField.qml
+++ b/resources/qml/MatrixTextField.qml
@@ -11,7 +11,7 @@ TextInput {
         anchors.top: parent.bottom
         anchors.horizontalCenter: parent.horizontalCenter
 
-        color: "blue"
+        color: colors.highlight
         height: 1
         width: parent.width
     
@@ -23,7 +23,7 @@ TextInput {
 
             height: parent.height+1
             width: 0
-            color: "#000000"
+            color: colors.text
         
             states: State {
                 name: "focused"; when: input.activeFocus == true
diff --git a/resources/qml/QuickSwitcher.qml b/resources/qml/QuickSwitcher.qml
index 2d2ae5cf..b772983a 100644
--- a/resources/qml/QuickSwitcher.qml
+++ b/resources/qml/QuickSwitcher.qml
@@ -10,10 +10,10 @@ Popup {
     x: parent.width / 2 - width / 2
     y: parent.height / 4 - height / 2
     width: parent.width / 2
-    height: textWidth
     modal: true
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
     parent: Overlay.overlay
+    palette: colors
 
     Overlay.modal: Rectangle {
         color: "#aa1E1E1E"
@@ -23,7 +23,8 @@ Popup {
         id: roomTextInput
 
         anchors.fill: parent
-        font.pixelSize: quickSwitcher.textWidth - 12
+        font.pixelSize: quickSwitcher.textWidth - 24
+        color: colors.text
 
         onTextEdited: {
             completerPopup.completer.setSearchString(text)