diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 67666a1ef..280957449 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -220,7 +220,11 @@ class OrganizationsController < ApplicationController
     #@organization.name = params[:organization][:name]
     @organization.save
      respond_to do |format|
-       format.html { redirect_to setting_organization_path(@organization)}
+       if @organization.show_mode == 1
+         format.html { redirect_to organization_path(@organization)}
+       else
+         format.html { redirect_to setting_organization_path(@organization)}
+       end
      end
   end