diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
index 99ecb42d2a9..98f05c8df5b 100644
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@@ -116,6 +116,7 @@ export default Ember.DefaultResolver.extend({
 
   resolveTemplate(parsedName) {
     return this.findPluginTemplate(parsedName) ||
+           this.findPluginMobileTemplate(parsedName) ||
            this.findMobileTemplate(parsedName) ||
            this.findTemplate(parsedName) ||
            Ember.TEMPLATES.not_found;
@@ -139,6 +140,11 @@ export default Ember.DefaultResolver.extend({
     return this.findTemplate(pluginParsedName);
   },
 
+  findPluginMobileTemplate(parsedName) {
+    var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/mobile/"));
+    return this.findTemplate(pluginParsedName);
+  },
+
   findMobileTemplate(parsedName) {
     if (this.mobileView) {
       var mobileParsedName = this.parseName(parsedName.fullName.replace("template:", "template:mobile/"));