diff --git a/app/views/spree/layouts/admin.html.haml b/app/views/spree/layouts/admin.html.haml
index fdfb6c0932..2457053ae0 100644
--- a/app/views/spree/layouts/admin.html.haml
+++ b/app/views/spree/layouts/admin.html.haml
@@ -4,5 +4,8 @@
     = render :partial => 'spree/admin/shared/head'
 
   %body.admin
-    %div{ "ng-app" => yield(:main_ng_app_name).strip.html_safe, "ng-controller" => yield(:main_ng_ctrl_name).strip.html_safe }
+    - if content_for?(:main_ng_app_name)
+      %div{ "ng-app" => yield(:main_ng_app_name).strip.html_safe, "ng-controller" => yield(:main_ng_ctrl_name).strip.html_safe }
+        = render :partial => 'spree/layouts/admin_body'
+    - else
       = render :partial => 'spree/layouts/admin_body'