diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index ba30ebdb9fa..e4e6d7d1ee5 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -10,20 +10,6 @@
   <div class='row'>
     {{#if controller.multiSelect}}
       <button class='post-select' {{action selectPost this}}>{{view.selectText}}</button>
-    {{else}}
-      <div class='topic-meta-data-inside'>
-        <div class='post-info'>
-          <a href='#' class='post-date' {{bindAttr data-share-url="shareUrl"}}>{{date created_at}}</a>
-        </div>
-        {{#if hasHistory}}
-          <div class='post-info edits'>
-            <a href='#' class="{{unbound historyHeat}}" {{action showHistory this}} title="{{editDate updated_at}}">
-              {{editCount}}
-              <i class='icon-pencil'></i>
-            </a>
-          </div>
-        {{/if}}
-      </div>
     {{/if}}
 
     {{#if showUserReplyTab}}
@@ -48,6 +34,21 @@
     <div class='topic-body span14'>
       <div {{bindAttr class="showUserReplyTab:avoid-tab view.repliesHidden:bottom-round :contents :regular view.extraClass"}}>
         {{view Discourse.PrependPostView postBinding="this"}}
+        {{#unless controller.multiSelect}}
+          <div class='topic-meta-data-inside'>
+            <div class='post-info'>
+              <a href='#' class='post-date' {{bindAttr data-share-url="shareUrl"}}>{{date created_at}}</a>
+            </div>
+            {{#if hasHistory}}
+              <div class='post-info edits'>
+                <a href='#' class="{{unbound historyHeat}}" {{action showHistory this}} title="{{editDate updated_at}}">
+                  {{editCount}}
+                  <i class='icon-pencil'></i>
+                </a>
+              </div>
+            {{/if}}
+          </div>
+        {{/unless}}
         {{view Discourse.RawDivView class="cooked" contentBinding="cooked"}}
         {{view Discourse.PostMenuView postBinding="this" postViewBinding="view"}}
       </div>
diff --git a/app/assets/stylesheets/application/topic-post.css.scss b/app/assets/stylesheets/application/topic-post.css.scss
index 8803aa4d4b0..69086f58462 100644
--- a/app/assets/stylesheets/application/topic-post.css.scss
+++ b/app/assets/stylesheets/application/topic-post.css.scss
@@ -495,14 +495,12 @@
       z-index: 490;
     }
     .topic-meta-data-inside {
-      position: absolute;
-      top: 4px;
-      right: 316px;
+      float: right;
+      margin-right: 10px;
       z-index: 490;
       .post-info {
         font-size: 12px;
         display: inline-block;
-        float: right;
         margin-right: 12px;
         &:first-child {
           margin-right: 0;