diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index 417fb9c..bce9b40 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -113,15 +113,11 @@ pre {
     min-width:99%;
 }
 
-#preview
+/*Set minimum height of the preview box and input
+  for the tabs when making a comment */
+#preview, .form-control#initial_comment
 {
     min-height: 12rem;
-    padding:1em;
-}
-
-.form-control#initial_comment
-{
-  min-height: 16rem;
 }
 
 .bodycontent
diff --git a/pagure/templates/comment_update.html b/pagure/templates/comment_update.html
index 3248ae4..e5ac679 100644
--- a/pagure/templates/comment_update.html
+++ b/pagure/templates/comment_update.html
@@ -22,7 +22,7 @@
           {{- comment.comment -}}
         </textarea>
       </div>
-      <div id="preview">
+      <div id="preview" class="p-1">
       </div>
     </fieldset>
 
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index a92f7f1..e89cef7 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -226,7 +226,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid)
               <div class="card-body">
                         <textarea class="form-control" rows=8 id="comment" name="comment"
                         placeholder="Enter your comment here" tabindex=1></textarea>
-                        <div id="preview">
+                        <div id="preview" class="p-1">
                         </div>
                         <div class="mt-2">
                             <label class="custom-file comment-upload-browse font-size-09">
diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html
index 2853c15..b1b4f97 100644
--- a/pagure/templates/new_issue.html
+++ b/pagure/templates/new_issue.html
@@ -124,7 +124,7 @@
                       </small>
                     </span>
                     {% endif %}
-                      <div id="preview">
+                      <div id="preview" class="p-1">
                       </div>
                       <div class="mt-2">
                           <label class="custom-file comment-upload-browse font-size-09">
diff --git a/pagure/templates/pull_request_title.html b/pagure/templates/pull_request_title.html
index c520597..b419428 100644
--- a/pagure/templates/pull_request_title.html
+++ b/pagure/templates/pull_request_title.html
@@ -47,7 +47,7 @@
                   {{- form.initial_comment.data -}}
                 </textarea>
               </div>
-              <div id="preview">
+              <div id="preview" class="p-1">
               </div>
             </fieldset>
 
diff --git a/pagure/templates/repo_new_pull_request.html b/pagure/templates/repo_new_pull_request.html
index 9f35daf..208897c 100644
--- a/pagure/templates/repo_new_pull_request.html
+++ b/pagure/templates/repo_new_pull_request.html
@@ -198,7 +198,7 @@
             </small>
           </span>
           {% endif %}
-            <div id="preview">
+            <div id="preview" class="p-1">
             </div>
           </div>
           <div class="card-footer bg-light">
diff --git a/pagure/templates/repo_pull_request.html b/pagure/templates/repo_pull_request.html
index 94700dd..eb680da 100644
--- a/pagure/templates/repo_pull_request.html
+++ b/pagure/templates/repo_pull_request.html
@@ -424,7 +424,7 @@
       <div class="card-body">
                 <textarea class="form-control" rows=8 id="comment" name="comment"
                 placeholder="Enter your comment here" tabindex=1></textarea>
-                <div id="preview">
+                <div id="preview" class="p-1">
                 </div>
         </div>
         <div class="d-flex align-items-center card-footer bg-light">