diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index f24e472d..8af80d5c 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -526,7 +526,7 @@ Item {
     property string generalKeyboardShortcuts: qsTr("General")
     property string conversationKeyboardShortcuts: qsTr("Conversation")
     property string callKeyboardShortcuts: qsTr("Call")
-    property string settingsKeyboardShortcuts: qsTr("Settings")
+    property string settings: qsTr("Settings")
     property string openAccountList: qsTr("Open account list")
     property string focusConversationsList: qsTr("Focus conversations list")
     property string requestsList: qsTr("Requests list")
diff --git a/src/app/mainview/components/KeyboardShortcutTable.qml b/src/app/mainview/components/KeyboardShortcutTable.qml
index dcc1d21f..591ee637 100644
--- a/src/app/mainview/components/KeyboardShortcutTable.qml
+++ b/src/app/mainview/components/KeyboardShortcutTable.qml
@@ -196,7 +196,7 @@ Window {
                     case 2:
                         return JamiStrings.callKeyboardShortcuts
                     case 3:
-                        return JamiStrings.settingsKeyboardShortcuts
+                        return JamiStrings.settings
 
                     }
                 }
diff --git a/src/app/mainview/components/SwarmDetailsPanel.qml b/src/app/mainview/components/SwarmDetailsPanel.qml
index 6b37db0e..49e7940a 100644
--- a/src/app/mainview/components/SwarmDetailsPanel.qml
+++ b/src/app/mainview/components/SwarmDetailsPanel.qml
@@ -133,6 +133,7 @@ Rectangle {
 
                 text: CurrentConversation.description
                 readOnly: !root.isAdmin
+                visible: root.isAdmin || text.length > 0
                 placeholderText: JamiStrings.addADescription
                 placeholderTextColor: {
                     if (editable) {
@@ -173,10 +174,10 @@ Rectangle {
                 }
 
                 Layout.preferredWidth: root.width
-                Layout.preferredHeight: aboutTabButton.height
+                Layout.preferredHeight: settingsTabButton.height
 
                 FilterTabButton {
-                    id: aboutTabButton
+                    id: settingsTabButton
                     backgroundColor: CurrentConversation.color
                     hoverColor: CurrentConversation.color
                     borderWidth: 4
@@ -190,7 +191,7 @@ Rectangle {
                                    JamiTheme.chatviewTextColorDark
 
                     down: tabBar.currentIndex === 0
-                    labelText: JamiStrings.about
+                    labelText: JamiStrings.settings
                     Layout.fillWidth: true
                 }