diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index ef6dfe46..e1ecee62 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -464,6 +464,7 @@ Item {
     property string importAccountFromBackup: qsTr("Import account from backup file")
     property string advancedFeatures: qsTr("Advanced features")
     property string showAdvancedFeatures: qsTr("Show advanced features")
+    property string hideAdvancedFeatures: qsTr("Hide advanced features")
     property string connectJAMSServer: qsTr("Connect to a JAMS server")
     property string createFromJAMS: qsTr("Create account from Jami Account Management Server (JAMS)")
     property string addSIPAccount: qsTr("Add a SIP account")
diff --git a/src/wizardview/components/WelcomePage.qml b/src/wizardview/components/WelcomePage.qml
index 197efdeb..4557e6ae 100644
--- a/src/wizardview/components/WelcomePage.qml
+++ b/src/wizardview/components/WelcomePage.qml
@@ -162,6 +162,8 @@ Rectangle {
         MaterialButton {
             id: showAdvancedButton
 
+            property bool showAdvanced: false
+
             Layout.alignment: Qt.AlignCenter
             Layout.bottomMargin: newSIPAccountButton.visible ?
                                      0 : JamiTheme.wizardViewPageBackButtonMargins
@@ -170,7 +172,8 @@ Rectangle {
 
             text: JamiStrings.advancedFeatures
             fontCapitalization: Font.AllUppercase
-            toolTipText: JamiStrings.showAdvancedFeatures
+            toolTipText: showAdvanced ? JamiStrings.hideAdvancedFeatures :
+                                        JamiStrings.showAdvancedFeatures
             color: JamiTheme.buttonTintedBlue
             hoveredColor: JamiTheme.buttonTintedBlueHovered
             pressedColor: JamiTheme.buttonTintedBluePressed
@@ -179,8 +182,9 @@ Rectangle {
             hoverEnabled: true
 
             onClicked: {
-                connectAccountManagerButton.visible = !connectAccountManagerButton.visible
-                newSIPAccountButton.visible = !newSIPAccountButton.visible
+                showAdvanced =  !showAdvanced
+                connectAccountManagerButton.visible = showAdvanced
+                newSIPAccountButton.visible = showAdvanced
             }
         }