diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml
index 89921ca4..965789bc 100644
--- a/resources/qml/Completer.qml
+++ b/resources/qml/Completer.qml
@@ -112,7 +112,7 @@ Control {
             ListView.delayRemove: true
             color: model.index == popup.currentIndex ? palette.highlight : palette.base
             height: (chooser.child?.implicitHeight ?? 0) + 2 * popup.rowMargin
-            implicitWidth: fullWidth ? ListView.view.width : chooser.child.implicitWidth + 4
+            implicitWidth: popup.fullWidth ? ListView.view.width : chooser.child.implicitWidth + 4
 
             MouseArea {
                 id: mouseArea
diff --git a/resources/qml/ForwardCompleter.qml b/resources/qml/ForwardCompleter.qml
index 8ed6017c..c5c1689a 100644
--- a/resources/qml/ForwardCompleter.qml
+++ b/resources/qml/ForwardCompleter.qml
@@ -38,7 +38,7 @@ Popup {
         roomTextInput.forceActiveFocus();
     }
 
-    Column {
+    contentItem: Column {
         id: forwardColumn
 
         spacing: 5
diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml
index ffe80a2e..4396f1d3 100644
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@@ -340,10 +340,9 @@ Rectangle {
                         }
                     }
 
-                    Completer {
+                    contentItem: Completer {
                         id: completer
 
-                        anchors.fill: parent
                         rowMargin: 2
                         rowSpacing: 0
                     }
diff --git a/resources/qml/QuickSwitcher.qml b/resources/qml/QuickSwitcher.qml
index 10b9bf25..7d18a76e 100644
--- a/resources/qml/QuickSwitcher.qml
+++ b/resources/qml/QuickSwitcher.qml
@@ -32,8 +32,7 @@ Popup {
         roomTextInput.forceActiveFocus();
     }
 
-    Column {
-        anchors.fill: parent
+    contentItem: Column {
         spacing: 1
 
         MatrixTextField {