diff --git a/src/assets/app.scss b/src/assets/app.scss
index e1a5d052..ae1ff687 100644
--- a/src/assets/app.scss
+++ b/src/assets/app.scss
@@ -346,6 +346,10 @@ textarea.form-control {
         &.active {
             background-color: #cdf8f4;
         }
+        // Removes margin to line up tags list with uptime percentage
+        .tags, .tag-wrapper:first-child {
+            margin-left: 0 !important;
+        }
     }
 }
 
diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue
index 39fb342e..97441d50 100644
--- a/src/components/PublicGroupList.vue
+++ b/src/components/PublicGroupList.vue
@@ -40,6 +40,9 @@
 
                                             <Uptime :monitor="monitor.element" type="24" :pill="true" />
                                             {{ monitor.element.name }}
+
+                                        </div>
+                                        <div class="tags">
                                             <Tag v-for="tag in monitor.element.tags" :key="tag" :item="tag" :size="'sm'" />
                                         </div>
                                     </div>