diff --git a/src/mainview/components/PluginHandlerPicker.qml b/src/mainview/components/PluginHandlerPicker.qml
index c66603d472b074ff7a184995634c42c5406d59dd..2a6f60678f81d8fb34fb1858055d6c284b5c282a 100644
--- a/src/mainview/components/PluginHandlerPicker.qml
+++ b/src/mainview/components/PluginHandlerPicker.qml
@@ -93,22 +93,9 @@ Popup {
                 RowLayout {
                     height: JamiTheme.preferredFieldHeight
 
-                    PushButton {
-                        id: closeButton
-                        Layout.leftMargin: 5
-                        Layout.topMargin: 5
-
-                        source: "qrc:/images/icons/round-close-24px.svg"
-                        imageColor: JamiTheme.textColor
-
-                        onClicked: {
-                            root.close()
-                        }
-                    }
-
                     Text {
                         Layout.topMargin: 10
-                        Layout.rightMargin: 5 + closeButton.width
+                        Layout.leftMargin: 5 + closeButton.width
                         Layout.alignment: Qt.AlignCenter
                         Layout.fillWidth: true
 
@@ -121,6 +108,20 @@ Popup {
 
                         text: qsTr("Choose plugin")
                     }
+
+                    PushButton {
+                        id: closeButton
+                        Layout.alignment: Qt.AlignRight
+                        Layout.rightMargin: 5
+                        Layout.topMargin: 5
+
+                        source: "qrc:/images/icons/round-close-24px.svg"
+                        imageColor: JamiTheme.textColor
+
+                        onClicked: {
+                            root.close()
+                        }
+                    }
                 }
 
                 ListView {