diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
index 7ffb39dbce..75a691e81b 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
@@ -54,6 +54,23 @@ limitations under the License.
     pointer-events: none;
 }
 
+.mx_GroupView_editable {
+    border-bottom: 1px solid $strong-input-border-color ! important;
+    min-width: 150px;
+    cursor: text;
+}
+
+.mx_GroupView_editable:focus {
+    border-bottom: 1px solid $accent-color ! important;
+    outline: none;
+    box-shadow: none;
+}
+
+.mx_GroupView_header_name:hover div:not(.mx_GroupView_editable) {
+    color: $accent-color;
+    cursor: pointer;
+}
+
 .mx_GroupView_avatarPicker {
     position: relative;
 }
@@ -103,10 +120,6 @@ limitations under the License.
     border-bottom: 1px solid transparent;
 }
 
-.mx_GroupView_header_name input, .mx_GroupView_header_shortDesc input {
-    width: 400px;
-}
-
 .mx_GroupView_header_shortDesc {
     vertical-align: bottom;
     float: left;