diff --git a/src/settingsview/components/AdvancedSettings.qml b/src/settingsview/components/AdvancedSettings.qml
index c3b830422f5445ede31c66f38ccd9113750aab2b..b7141824a393d4af6aa629a6df009b6efcd88952 100644
--- a/src/settingsview/components/AdvancedSettings.qml
+++ b/src/settingsview/components/AdvancedSettings.qml
@@ -35,6 +35,7 @@ ColumnLayout {
     property bool isSIP
     property int itemWidth
     property alias settingsVisible: advancedSettingsView.visible
+    signal showAdvancedSettingsRequest
 
     function updateAdvancedAccountInfos() {
         advancedCallSettings.updateCallSettingsInfos()
@@ -90,6 +91,7 @@ ColumnLayout {
                 advancedSettingsView.visible = !advancedSettingsView.visible
                 if(advancedSettingsView.visible)
                     updateAdvancedAccountInfos()
+                showAdvancedSettingsRequest()
             }
         }
     }
diff --git a/src/settingsview/components/CurrentAccountSettings.qml b/src/settingsview/components/CurrentAccountSettings.qml
index ceaa658941ea0afc358d663e3b953e0bafaac1a6..13e92ba884857aa4c1963ca3d1c6389f1a443062 100644
--- a/src/settingsview/components/CurrentAccountSettings.qml
+++ b/src/settingsview/components/CurrentAccountSettings.qml
@@ -85,8 +85,8 @@ Rectangle {
     }
 
     function getAdvancedSettingsScrollPosition() {
-        return advancedSettings.y / (currentAccountSettingsColumnLayout.height
-                                     - advancedSettings.height + 40) // 40 = btnSize+margin
+        return advancedSettings.height / (currentAccountSettingsColumnLayout.height
+                                     + advancedSettings.height + 46) // 40 = btnSize+2*margin
     }
 
     function setPasswordButtonText() {
@@ -319,7 +319,9 @@ Rectangle {
             itemWidth: preferredColumnWidth
             isSIP: root.isSIP
 
-            onHeightChanged: advancedSettingsToggled(settingsVisible)
+            onShowAdvancedSettingsRequest: {
+                advancedSettingsToggled(settingsVisible)
+            }
         }
     }
 }