diff --git a/app/assets/javascripts/discourse/components/topic_map_component.js b/app/assets/javascripts/discourse/components/topic_map_component.js
index 6b835d9750a..721542ee819 100644
--- a/app/assets/javascripts/discourse/components/topic_map_component.js
+++ b/app/assets/javascripts/discourse/components/topic_map_component.js
@@ -19,7 +19,7 @@ Discourse.TopicMapComponent = Ember.Component.extend({
     this._super();
 
     // If the topic has a summary, expand the map by default
-    this.set('mapCollapsed', !this.get('topic.has_summary'));
+    this.set('mapCollapsed', Discourse.Mobile.mobileView || (!this.get('topic.has_summary')));
   },
 
   toggleMapClass: function() {
diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars b/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars
index 7a5a08d0982..02e4dfb299a 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars
@@ -4,7 +4,7 @@
   </button>
 </nav>
 
-<section class='map collapsed'>
+<section {{bindAttr class=":map mapCollapsed"}}>
   <ul class="clearfix">
     <li>
       <a href='{{unbound topic.url}}'>
@@ -24,22 +24,22 @@
       <h4>{{i18n posts}}</h4>
       {{number topic.posts_count}}
     </li>
-    <li>
+    <li class='secondary'>
       <h4>{{i18n views}}</h4>
       {{number topic.views}}
     </li>
-    <li>
+    <li class='secondary'>
       <h4>{{i18n users}}</h4>
       {{number topic.participant_count}}
     </li>
     {{#if topic.like_count}}
-      <li>
+      <li class='secondary'>
         <h4>{{i18n likes}}</h4>
         <i class='icon icon-heart'></i> {{number topic.like_count}}
       </li>
     {{/if}}
     {{#if details.links.length}}
-    <li>
+    <li class='secondary'>
       <h4>{{i18n links}}</h4>
       {{number details.links.length}}
     </li>
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 6ac9de03160..576cb70139a 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -268,8 +268,6 @@ a.star {
   }
 
   .map {
-    &.collapsed {
-    }
     li {
       float: left;
       padding: 7px 11px;
@@ -277,9 +275,7 @@ a.star {
         border-right: 0;
       }
     }
-    a,
-
-    .number {
+    a, .number {
       font-weight: bold;
       line-height: 20px;
     }
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 858abc01d62..8759944bee0 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -186,9 +186,13 @@ a.star {
     margin-right: 4px;
   }
 
-  .map {
-    &.collapsed {
+  .map-collapsed {
+    .secondary {
+      display: none;
     }
+  }
+
+  .map {
     li {
       float: left;
       padding: 7px 11px;
@@ -196,9 +200,7 @@ a.star {
         border-right: 0;
       }
     }
-    a,
-
-    .number {
+    a, .number {
       font-weight: bold;
       line-height: 20px;
     }