diff --git a/website/views/options/social/boss.jade b/website/views/options/social/boss.jade
index 62b0751cf3..050d02cf24 100644
--- a/website/views/options/social/boss.jade
+++ b/website/views/options/social/boss.jade
@@ -13,22 +13,6 @@ mixin boss(tavern, mobile)
           li(ng-class="{active:selectedTab === 2}")
             a(ng-click="selectedTab = 2")
               =env.t('questDetails')
-        div(ng-show="selectedTab === 2")
-          br
-          div(class="quest_{{::group.quest.key}}")
-          div(ng-if='::Content.quests[group.quest.key].boss')
-            h4 {{::Content.quests[group.quest.key].boss.name()}}
-            p
-              strong=env.t('bossHP') + ': '
-              | {{::Content.quests[group.quest.key].boss.hp}}
-            p
-              strong=env.t('bossStrength') + ': '
-              | {{::Content.quests[group.quest.key].boss.str}}
-          div(ng-if='::Content.quests[group.quest.key].collect')
-            p(ng-repeat='(k,v) in ::Content.quests[group.quest.key].collect')
-              strong=env.t('collect') + ': '
-              | {{::Content.quests[group.quest.key].collect[k].count}} {{::Content.quests[group.quest.key].collect[k].text()}}
-          div(ng-bind-html='::Content.quests[group.quest.key].notes()')
         div(ng-show="selectedTab === 1")
           br
           table.table.table-striped(bindonce='group')
@@ -49,6 +33,22 @@ mixin boss(tavern, mobile)
           // =env.t('questOwnerNotInPendingQuest')
         // span(ng-if=':: ! group.quest.leader || ! isMemberOfGroup(group.quest.leader,group)')
           // =env.t('questOwnerNotInPendingQuestParty')
+        div(ng-show="selectedTab === 2")
+          br
+          div(class="quest_{{::group.quest.key}}")
+          div(ng-if='::Content.quests[group.quest.key].boss')
+            h4 {{::Content.quests[group.quest.key].boss.name()}}
+            p
+              strong=env.t('bossHP') + ': '
+              | {{::Content.quests[group.quest.key].boss.hp}}
+            p
+              strong=env.t('bossStrength') + ': '
+              | {{::Content.quests[group.quest.key].boss.str}}
+          div(ng-if='::Content.quests[group.quest.key].collect')
+            p(ng-repeat='(k,v) in ::Content.quests[group.quest.key].collect')
+              strong=env.t('collect') + ': '
+              | {{::Content.quests[group.quest.key].collect[k].count}} {{::Content.quests[group.quest.key].collect[k].text()}}
+          div(ng-bind-html='::Content.quests[group.quest.key].notes()')
         hr
         .npc_ian.pull-left
         p=env.t('questStart')
@@ -61,15 +61,34 @@ mixin boss(tavern, mobile)
         // only the quest owner sees the cancel button:
         button.btn.btn-sm.btn-danger(ng-if=':: (group.quest.leader  && group.quest.leader==user._id && isMemberOfGroup(group.quest.leader,group) && isMemberOfPendingQuest(group.quest.leader,group))', ng-click='questCancel()')=env.t('cancel')
 
-      div(ng-if='group.quest.active==true' ng-init='selectedTab=1')
+      div(ng-if='group.quest.active==true' ng-init='selectedTab=2')
         ul.nav.nav-pills
           li(ng-class="{active:selectedTab === 1}")
             a(ng-click="selectedTab = 1")
-                =env.t('questDetails')
+                =env.t('questParticipants')
           li(ng-class="{active:selectedTab === 2}")
             a(ng-click="selectedTab = 2")
-              =env.t('questParticipants')
-        div(ng-show="selectedTab === 1")
+              =env.t('questDetails')
+        unless tavern
+          div(ng-show="selectedTab === 1")
+            br
+            table.table.table-striped(bindonce='group')
+              tr(ng-repeat='(k,v) in group.members track by v._id', ng-if='::group.quest.members[v._id]')
+                td.media
+                  span(ng-if=':: group.quest.leader && group.quest.leader==v._id && isMemberOfGroup(group.quest.leader,group) && isMemberOfRunningQuest(group.quest.leader,group)')
+                    |* 
+                  a.media-body
+                    span(ng-click='clickMember(v._id, true)')
+                      |{{::v.profile.name}}
+            span(ng-if=':: group.quest.leader && isMemberOfGroup(group.quest.leader,group) && isMemberOfRunningQuest(group.quest.leader,group)')
+              |* 
+              =env.t('questOwner')
+            // This is commented-out until we have time to work out why it fails intermittently on the website and always on the mobile app (https://github.com/HabitRPG/habitrpg/issues/4074):
+            // span(ng-if=':: group.quest.leader && isMemberOfGroup(group.quest.leader,group) && ! isMemberOfRunningQuest(group.quest.leader,group)')
+              // =env.t('questOwnerNotInRunningQuest')
+            // span(ng-if=':: ! group.quest.leader || ! isMemberOfGroup(group.quest.leader,group)')
+              // =env.t('questOwnerNotInRunningQuestParty')
+        div(ng-show="selectedTab === 2")
           br
           div(ng-if='::Content.quests[group.quest.key].boss',ng-init='boss=Content.quests[group.quest.key].boss;progress=group.quest.progress')
             if tavern
@@ -109,25 +128,6 @@ mixin boss(tavern, mobile)
           div(ng-bind-html='::Content.quests[group.quest.key].notes()')
           unless tavern
             quest-rewards(key='{{::group.quest.key}}')
-        unless tavern
-          div(ng-show="selectedTab === 2")
-            br
-            table.table.table-striped(bindonce='group')
-              tr(ng-repeat='(k,v) in group.members track by v._id', ng-if='::group.quest.members[v._id]')
-                td.media
-                  span(ng-if=':: group.quest.leader && group.quest.leader==v._id && isMemberOfGroup(group.quest.leader,group) && isMemberOfRunningQuest(group.quest.leader,group)')
-                    |* 
-                  a.media-body
-                    span(ng-click='clickMember(v._id, true)')
-                      |{{::v.profile.name}}
-            span(ng-if=':: group.quest.leader && isMemberOfGroup(group.quest.leader,group) && isMemberOfRunningQuest(group.quest.leader,group)')
-              |* 
-              =env.t('questOwner')
-            // This is commented-out until we have time to work out why it fails intermittently on the website and always on the mobile app (https://github.com/HabitRPG/habitrpg/issues/4074):
-            // span(ng-if=':: group.quest.leader && isMemberOfGroup(group.quest.leader,group) && ! isMemberOfRunningQuest(group.quest.leader,group)')
-              // =env.t('questOwnerNotInRunningQuest')
-            // span(ng-if=':: ! group.quest.leader || ! isMemberOfGroup(group.quest.leader,group)')
-              // =env.t('questOwnerNotInRunningQuestParty')
 
         div(ng-if='::Content.quests[group.quest.key].boss')
           .npc_ian.pull-left