diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml
index eeefe5f0..7b18951c 100644
--- a/resources/qml/Completer.qml
+++ b/resources/qml/Completer.qml
@@ -24,9 +24,6 @@ Control {
     property int rowMargin: 0
     property int rowSpacing: Nheko.paddingSmall
 
-    // Workaround palettes not inheriting for popups
-    palette: timelineRoot.palette
-
     signal completionClicked(string completion)
     signal completionSelected(string id)
 
@@ -76,6 +73,9 @@ Control {
 
     bottomPadding: 1
     leftPadding: 1
+
+    // Workaround palettes not inheriting for popups
+    palette: timelineRoot.palette
     rightPadding: 1
     topPadding: 1
 
diff --git a/resources/qml/ForwardCompleter.qml b/resources/qml/ForwardCompleter.qml
index 7ad26491..0174e0f6 100644
--- a/resources/qml/ForwardCompleter.qml
+++ b/resources/qml/ForwardCompleter.qml
@@ -18,15 +18,15 @@ Popup {
 
     leftPadding: 10
     modal: true
+
+    // Workaround palettes not inheriting for popups
+    palette: timelineRoot.palette
     parent: Overlay.overlay
     rightPadding: 10
     width: timelineRoot.width * 0.8
     x: Math.round(parent.width / 2 - width / 2)
     y: Math.round(parent.height / 4)
 
-    // Workaround palettes not inheriting for popups
-    palette: timelineRoot.palette
-
     Overlay.modal: Rectangle {
         color: Qt.rgba(palette.window.r, palette.window.g, palette.window.b, 0.7)
     }
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 002f64b9..3eed4c48 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -163,8 +163,8 @@ Item {
                 url: wrapper.url
                 userId: wrapper.userId
                 userName: wrapper.userName
-                y: section.visible && section.active ? section.y + section.height : 0
                 width: wrapper.width
+                y: section.visible && section.active ? section.y + section.height : 0
 
                 background: Rectangle {
                     id: scrollHighlight
diff --git a/resources/qml/QuickSwitcher.qml b/resources/qml/QuickSwitcher.qml
index 7d3686ed..67718ecb 100644
--- a/resources/qml/QuickSwitcher.qml
+++ b/resources/qml/QuickSwitcher.qml
@@ -16,14 +16,14 @@ Popup {
     background: null
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
     modal: true
+
+    // Workaround palettes not inheriting for popups
+    palette: timelineRoot.palette
     parent: Overlay.overlay
     width: Math.min(Math.max(Math.round(parent.width / 2), 450), parent.width) // limiting width to parent.width/2 can be a bit narrow
     x: Math.round(parent.width / 2 - contentWidth / 2)
     y: Math.round(parent.height / 4)
 
-    // Workaround palettes not inheriting for popups
-    palette: timelineRoot.palette
-
     Overlay.modal: Rectangle {
         color: "#aa1E1E1E"
     }
diff --git a/resources/qml/SelfVerificationCheck.qml b/resources/qml/SelfVerificationCheck.qml
index 80897ff9..1752df0e 100644
--- a/resources/qml/SelfVerificationCheck.qml
+++ b/resources/qml/SelfVerificationCheck.qml
@@ -23,6 +23,9 @@ Item {
         height: content.height + implicitFooterHeight + implicitHeaderHeight
         modal: true
         padding: 0
+
+        // Workaround palettes not inheriting for popups
+        palette: timelineRoot.palette
         parent: Overlay.overlay
         standardButtons: Dialog.Ok
         width: content.width
@@ -78,6 +81,9 @@ Item {
     MainWindowDialog {
         id: bootstrapCrosssigning
 
+        // Workaround palettes not inheriting for popups
+        palette: timelineRoot.palette
+
         background: Rectangle {
             border.color: Nheko.theme.separator
             border.width: 1
@@ -202,6 +208,8 @@ Item {
     MainWindowDialog {
         id: verifyMasterKey
 
+        // Workaround palettes not inheriting for popups
+        palette: timelineRoot.palette
         standardButtons: Dialog.Cancel
 
         GridLayout {
diff --git a/resources/qml/UploadBox.qml b/resources/qml/UploadBox.qml
index 215003ec..990fa422 100644
--- a/resources/qml/UploadBox.qml
+++ b/resources/qml/UploadBox.qml
@@ -37,6 +37,7 @@ Page {
         }
         delegate: Pane {
             id: pane
+
             height: uploadPopup.availableHeight - buttons.height - (scr.visible ? scr.height : 0)
             padding: Nheko.paddingSmall
             width: uploadPopup.availableHeight - buttons.height