diff --git a/tildes/scss/modules/_comment.scss b/tildes/scss/modules/_comment.scss
index 0e83dea..503f34e 100644
--- a/tildes/scss/modules/_comment.scss
+++ b/tildes/scss/modules/_comment.scss
@@ -32,15 +32,22 @@
   margin-left: 0.2rem;
 }
 
+.comment-time-info {
+  display: flex;
+  flex-wrap: wrap;
+}
+
 .comment-posted-time {
   margin-left: 0.4rem;
   font-size: 0.6rem;
+  white-space: nowrap;
 }
 
 .comment-edited-time {
   font-size: 0.6rem;
   font-style: italic;
   margin-left: 0.4rem;
+  white-space: nowrap;
 }
 
 .comment-excerpt {
diff --git a/tildes/tildes/templates/macros/comments.jinja2 b/tildes/tildes/templates/macros/comments.jinja2
index f7f4559..d8d66bb 100644
--- a/tildes/tildes/templates/macros/comments.jinja2
+++ b/tildes/tildes/templates/macros/comments.jinja2
@@ -61,13 +61,15 @@
           </span>
         {% endif %}
 
-        {{ adaptive_date_responsive(comment.created_time, class_="comment-posted-time") }}
+        <div class="comment-time-info">
+          {{ adaptive_date_responsive(comment.created_time, class_="comment-posted-time") }}
 
-        {% if comment.last_edited_time %}
-          <span class="comment-edited-time">
-            (edited {{ adaptive_date_responsive(comment.last_edited_time) }})
-          </span>
-        {% endif %}
+          {% if comment.last_edited_time %}
+            <span class="comment-edited-time">
+              (edited {{ adaptive_date_responsive(comment.last_edited_time) }})
+            </span>
+          {% endif %}
+        </div>
       {% else %}
         {% if comment.is_deleted %}
           <div class="is-comment-deleted">Comment deleted by author</div>