diff --git a/app/assets/javascripts/discourse/initializers/mobile.js.es6 b/app/assets/javascripts/discourse/initializers/mobile.js.es6
index 83b3e0c86e8..d39e0802570 100644
--- a/app/assets/javascripts/discourse/initializers/mobile.js.es6
+++ b/app/assets/javascripts/discourse/initializers/mobile.js.es6
@@ -3,9 +3,12 @@
 **/
 export default {
   name: 'mobile',
+  after: 'inject-objects',
 
-  initialize: function() {
+  initialize: function(container) {
     Discourse.Mobile.init();
+    var site = container.lookup('site:main');
+    site.set('mobileView', Discourse.Mobile.mobileView);
   }
 };
 
diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars
index 0a614137152..aff6e0d0859 100644
--- a/app/assets/javascripts/discourse/templates/composer.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars
@@ -79,7 +79,7 @@
             <div id="file-uploading" {{bind-attr class="view.isUploading::hidden"}}>
               {{i18n upload_selector.uploading}} {{view.uploadProgress}}% <a id="cancel-file-upload">{{i18n cancel}}</a>
             </div>
-            {{#if Discourse.Mobile.mobileView}}
+            {{#if site.mobileView}}
               <a {{bind-attr class=":mobile-file-upload view.isUploading:hidden"}}>{{i18n upload}}</a>
               <input type="file" id="mobile-uploader" />
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/history.js.handlebars b/app/assets/javascripts/discourse/templates/modal/history.js.handlebars
index 4ee725d3322..8e4c60343d9 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/history.js.handlebars
@@ -10,7 +10,7 @@
     {{#if loading}}<div id='revision-loading'><i class='fa fa-spinner fa-spin'></i>{{i18n loading}}</div>{{/if}}
     <div id="display-modes">
       <button {{bind-attr class=":btn displayingInline:btn-primary:standard"}} title="{{i18n post.revisions.displays.inline.title}}" {{action displayInline}}>{{{i18n post.revisions.displays.inline.button}}}</button>
-      {{#unless Discourse.Mobile.mobileView}}
+      {{#unless site.mobileView}}
         <button {{bind-attr class=":btn displayingSideBySide:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side.title}}" {{action displaySideBySide}}>{{{i18n post.revisions.displays.side_by_side.button}}}</button>
         <button {{bind-attr class=":btn displayingSideBySideMarkdown:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side_markdown.title}}" {{action displaySideBySideMarkdown}}>{{{i18n post.revisions.displays.side_by_side_markdown.button}}}</button>
       {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/search/post_result.js.handlebars b/app/assets/javascripts/discourse/templates/search/post_result.js.handlebars
index cda20bdc630..ca9caad16e1 100644
--- a/app/assets/javascripts/discourse/templates/search/post_result.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/search/post_result.js.handlebars
@@ -2,9 +2,9 @@
   <span class='topic'>
     {{i18n search.post_format post_number=post_number username=username}}
   </span>
-  {{#unless Discourse.Mobile.mobileView}}
-  <span class='blurb'>
-  {{{unbound blurb}}}
-  </span>
+  {{#unless controller.site.mobileView}}
+    <span class='blurb'>
+    {{{unbound blurb}}}
+    </span>
   {{/unless}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars b/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars
index 2a710c54c43..6ad3ef95e59 100644
--- a/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars
@@ -2,9 +2,9 @@
   <span class='topic'>
     {{topic-status topic=topic disableActions=true}}<span class='topic-title'>{{unbound topic.title}}</span>{{category-badge topic.category}}
   </span>
-  {{#unless Discourse.Mobile.mobileView}}
-  <span class='blurb'>
-  {{age created_at}} - {{{unbound blurb}}}
-  </span>
+  {{#unless controller.site.mobileView}}
+    <span class='blurb'>
+    {{age created_at}} - {{{unbound blurb}}}
+    </span>
   {{/unless}}
 </a>