diff --git a/src/themes/scss/theme/components/_boxes.scss b/src/themes/scss/theme/components/_boxes.scss
index 4e3bd83..49d3ee0 100644
--- a/src/themes/scss/theme/components/_boxes.scss
+++ b/src/themes/scss/theme/components/_boxes.scss
@@ -71,51 +71,6 @@
                 }
             }
         }
-
-        // comment form at the end
-        &.form:not(.issue-content) {
-            display: flex;
-            align-items: flex-start;
-            background-color: var(--color-body);
-            gap: var.get('measure/1x');
-            left: -68px !important;
-            width: calc(100% + 68px - 16px) !important;
-
-            @media (max-width: 768px) {
-                left: 0 !important;
-                margin-left: -16px !important;
-                width: auto !important;
-            }
-
-            .timeline-avatar {
-                display: block;
-                position: relative !important;
-                left: unset !important;
-                flex: 0 0 auto !important;
-            }
-
-            .content {
-                // fake title to mimic github new issue page
-                &:before {
-                    display: block;
-                    content: 'Add a comment';
-                    font-weight: 600;
-                    margin-bottom: var.get('measure/1x');
-                    margin-top: var.get('measure/.5x');
-                    font-size: var.get('font-size/lg');
-                }
-
-                display: block;
-                position: relative !important;
-                margin-left: 0 !important;
-                flex: 1;
-
-                .ui.segment {
-                    padding: 0 !important;
-                    border: none !important;
-                }
-            }
-        }
     }
 
     .comment-list .comment>.content>div:last-child {
diff --git a/src/themes/scss/theme/modules/issues/_issue.scss b/src/themes/scss/theme/modules/issues/_issue.scss
index 84ea330..cefe9e9 100644
--- a/src/themes/scss/theme/modules/issues/_issue.scss
+++ b/src/themes/scss/theme/modules/issues/_issue.scss
@@ -62,6 +62,53 @@
                 border-radius: var(--border-radius);
             }
         }
+
+        &.comment {
+            // comment form at the end
+            &.form:not(.issue-content) {
+                display: flex;
+                align-items: flex-start;
+                background-color: var(--color-body);
+                gap: var.get('measure/1x');
+                left: -68px !important;
+                width: calc(100% + 68px - 16px) !important;
+
+                @media (max-width: 768px) {
+                    left: 0 !important;
+                    margin-left: -16px !important;
+                    width: auto !important;
+                }
+
+                .timeline-avatar {
+                    display: block;
+                    position: relative !important;
+                    left: unset !important;
+                    flex: 0 0 auto !important;
+                }
+
+                .content {
+                    // fake title to mimic github new issue page
+                    &:before {
+                        display: block;
+                        content: 'Add a comment';
+                        font-weight: 600;
+                        margin-bottom: var.get('measure/1x');
+                        margin-top: var.get('measure/.5x');
+                        font-size: var.get('font-size/lg');
+                    }
+
+                    display: block;
+                    position: relative !important;
+                    margin-left: 0 !important;
+                    flex: 1;
+
+                    .ui.segment {
+                        padding: 0 !important;
+                        border: none !important;
+                    }
+                }
+            }
+        }
     }
 
     .repository.view.issue {