diff --git a/src/components/ChatHeader.vue b/src/components/ChatHeader.vue
index 57eadd3..223f760 100644
--- a/src/components/ChatHeader.vue
+++ b/src/components/ChatHeader.vue
@@ -48,7 +48,7 @@
       </v-col>
       <v-col cols="auto" class="text-end ma-0 pa-0 ms-1 clickable close-button more-menu-button">
         <div :class="{ 'popup-open': showMoreMenu }">
-          <v-btn class="mx-2 box-shadow-none" fab dark small color="transparent" @click.stop="showMoreMenu = true">
+          <v-btn class="mx-2 box-shadow-none" fab dark small color="transparent" @click.stop="onShowMoreMenu">
             <v-icon size="15">$vuetify.icons.ic_more</v-icon>
           </v-btn>
         </div>
@@ -232,6 +232,12 @@ export default {
   },
 
   methods: {
+    onShowMoreMenu() {
+      if(this.publicRoomLink == null) {
+        this.roomJoinRule = this.getRoomJoinRule();
+      }
+      this.showMoreMenu = true
+    },
     setHasShownMissedItemsHint() {
       this.$store.commit('setHasShownMissedItemsHint', "1");
       this.showMissedItemsInfo = false;
diff --git a/src/components/CreateRoom.vue b/src/components/CreateRoom.vue
index 0ac27dd..1660cc4 100644
--- a/src/components/CreateRoom.vue
+++ b/src/components/CreateRoom.vue
@@ -333,7 +333,7 @@ export default {
           visibility: "private", // Not listed!
           name: this.roomName,
           preset: "public_chat",
-          initial_state: 
+          initial_state:
             this.unencryptedRoom ? [
             {
               type: "m.room.history_visibility",
@@ -342,7 +342,7 @@ export default {
                 history_visibility: "shared"
               }
             }
-            ] :  
+            ] :
           [
             {
               type: "m.room.encryption",