diff --git a/Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx b/Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx
index e508e8c2..aebf1982 100644
--- a/Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx
+++ b/Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx
@@ -3,13 +3,13 @@
 [BREADCRUMB]
 [GROUPSECTION]
 		<div class="dcf-forums">
-			[GROUP]
             <div class="dcf-group-title-wrap d-flex align-items-center py-2">
 				<h3 class="dcf-group-title h5 flex-grow-1">[RESX:Group]: [FORUMGROUP:GROUPLINK|<a href="{0}" class="dcf-forumgroup-link">[FORUMGROUP:GROUPNAME]</a>]</h3>
 				<a class="bs-collapse" data-toggle="collapse" href="#forum-group-[FORUMGROUP:FORUMGROUPID]" role="button" data-bs-toggle="collapse">
 					<i class="fa fa-chevron-circle-down fa-lg"></i>
 				</a>
 			</div>
+            [GROUP]
 			<div id="forum-group-[FORUMGROUPID]"  class="dcf-forums-group collapse show">
 				<table class="dcf-table dcf-table-100 table table-responsive-md">
 					<thead>
diff --git a/Dnn.CommunityForums/themes/community-default/templates/ForumView.ascx b/Dnn.CommunityForums/themes/community-default/templates/ForumView.ascx
index 2e3aaca5..121e2af2 100644
--- a/Dnn.CommunityForums/themes/community-default/templates/ForumView.ascx
+++ b/Dnn.CommunityForums/themes/community-default/templates/ForumView.ascx
@@ -3,12 +3,12 @@
 [BREADCRUMB]
 [GROUPSECTION]
 <div class="dcf-forums">
-	
-		[GROUP]
         <div class="dcf-group-title-wrap">
             <h3 class="dcf-group-title">[RESX:Group]: [FORUMGROUP:GROUPLINK|<a href="{0}" class="dcf-forumgroup-link">[FORUMGROUP:GROUPNAME]</a>]</h3>
             <span class="dcf-group-collapse">[FORUMGROUP:GROUPCOLLAPSE]</span>
         </div>
+
+        [GROUP]
 		<div class="dcf-forums-group">
 			<table class="dcf-table dcf-table-100">
 				<thead>