diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index 518e9635..b66a9727 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -139,14 +139,13 @@ helper Admin::PagePartsHelper
   def setup_app_frontend_and_style
     if @module_app.nil?
       @item.module_app.app_pages.each{|name,data| @app_frontend_urls << [I18n.t(data["i18n"]),name]}
+      @frontend_styles = @item.module_app.app_pages[@item.frontend_style]["style"] if @frontend_styles.nil? && @item && @item.module_app.app_pages[@item.frontend_style]
+      @frontend_styles = @item.module_app.app_pages.first[1]["style"] if @frontend_styles.nil? && @item
     else
       @module_app.app_pages.each{|name,data| @app_frontend_urls << [I18n.t(data["i18n"]),name]}
+      @frontend_styles = @module_app.app_pages[params["frontend"]]["style"] rescue nil
+      @frontend_styles = @module_app.app_pages.first[1]["style"] if @frontend_styles.nil?
     end
-    
-    @frontend_styles = @module_app.app_pages[params["frontend"]]["style"] rescue nil
-    @frontend_styles = @item.module_app.app_pages[@item.frontend_style]["style"] if @frontend_styles.nil? && @item && @item.module_app.app_pages[@item.frontend_style]
-    @frontend_styles = @item.module_app.app_pages.first[1]["style"] if @frontend_styles.nil? && @item
-    @frontend_styles = @module_app.app_pages.first[1]["style"] if @frontend_styles.nil?
   end
 
   def reload_frontend_pages