diff --git a/src/app/commoncomponents/DualPaneView.qml b/src/app/commoncomponents/DualPaneView.qml
index 98d0073bc4d6d148d07ea39c9eb725e74576d693..57b24d3f6fc498d4a2c5aedf76565e4ce365403f 100644
--- a/src/app/commoncomponents/DualPaneView.qml
+++ b/src/app/commoncomponents/DualPaneView.qml
@@ -85,10 +85,12 @@ BaseView {
         clip: true
         required property bool isMinorPane
         onWidthChanged: {
-            if (!isSinglePane && ((isRTL && !isMinorPane) || (!isRTL && isMinorPane)))
+            if (!isSinglePane && isMinorPane)
                 previousMinorPaneWidth = width
-            if (!isSinglePane && ((isRTL && isMinorPane) || (!isRTL && !isMinorPane)))
+            if (!isSinglePane && !isMinorPane)
                 previousMajorPaneWidth = width
+            if (isMinorPane)
+                JamiTheme.currentLeftPaneWidth = width
         }
 
         Connections {
@@ -101,8 +103,9 @@ BaseView {
             }
         }
 
-        SplitView.minimumWidth: isSinglePane ? viewNode.width : (isMinorPane && !isRTL ? minorPaneMinWidth : majorPaneMinWidth)
-        SplitView.maximumWidth: isSinglePane ? viewNode.width : viewNode.width - (isMinorPane && !isRTL ? majorPaneMinWidth : minorPaneMinWidth)
-        SplitView.preferredWidth: isMinorPane && !isRTL ? minorPaneMinWidth : majorPaneMinWidth
+        SplitView.minimumWidth: isSinglePane ? undefined : (isMinorPane ? minorPaneMinWidth : majorPaneMinWidth)
+        SplitView.maximumWidth: isSinglePane || !isMinorPane ? undefined : Math.abs(viewNode.width - majorPaneMinWidth)
+        SplitView.preferredWidth: isSinglePane || !isMinorPane ? undefined : JamiTheme.currentLeftPaneWidth
+        SplitView.fillWidth: !isMinorPane || isSinglePane
     }
 }
diff --git a/src/app/constant/JamiTheme.qml b/src/app/constant/JamiTheme.qml
index 4b0f5c8d44885a3337ab45709008a9bb37713baa..3d421faa0147f9b6a0b2cdc69ced7d20c0f6b65e 100644
--- a/src/app/constant/JamiTheme.qml
+++ b/src/app/constant/JamiTheme.qml
@@ -307,6 +307,7 @@ Item {
 
     // Sizes
     property real mainViewLeftPaneMinWidth: 300
+    property real currentLeftPaneWidth: mainViewLeftPaneMinWidth
     property real mainViewPaneMinWidth: 490
     property real qrCodeImageSize: 256
     property real splitViewHandlePreferredWidth: 4
diff --git a/src/app/mainview/components/TipsRow.qml b/src/app/mainview/components/TipsRow.qml
index d230a256b9b3c0512c46c444d99691dba98dc227..f5d3a7636efa30d4eb8a74fd793cac8fd6d1ec1f 100644
--- a/src/app/mainview/components/TipsRow.qml
+++ b/src/app/mainview/components/TipsRow.qml
@@ -59,7 +59,7 @@ JamiFlickable {
                 type: Type
                 property bool hideTipBox: false
                 anchors.bottom: row.bottom
-                textColor:tipsTextColor
+                textColor: tipsTextColor
                 iconColor: tipsRow.iconColor
 
                 visible: {
@@ -74,14 +74,14 @@ JamiFlickable {
                 }
 
                 enabled: {
-                    if (x >= tipsRow.width)
+                    if (x > tipsRow.width || x < tipsRow.x )
                         return false;
                     else
                         return true;
                 }
 
                 opacity: {
-                    if (x >= tipsRow.width)
+                    if (x > tipsRow.width || x < tipsRow.x )
                         return 0;
                     else
                         return 1;
diff --git a/src/app/settingsview/SettingsSidePanel.qml b/src/app/settingsview/SettingsSidePanel.qml
index 92511de41e6b3d4eeb76f704f239a33bfe38f14b..fb0909b1420f9a7493a57f2faff7ab37be82160b 100644
--- a/src/app/settingsview/SettingsSidePanel.qml
+++ b/src/app/settingsview/SettingsSidePanel.qml
@@ -226,7 +226,7 @@ SidePanelBase {
 
                 ListView {
                     id: childListView
-                    width: parent.width
+                    Layout.fillWidth: true
                     height: childrenRect.height
                     clip: true
                     visible: isChildSelected