diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php
index 8399edb37..443005077 100644
--- a/modules/editor/editor.controller.php
+++ b/modules/editor/editor.controller.php
@@ -144,7 +144,12 @@
             }
 
             $this->setError(-1);
-            $this->setMessage('success_updated');
+            $this->setMessage('success_updated', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
         }
 
         /**
diff --git a/modules/editor/tpl/editor_module_config.html b/modules/editor/tpl/editor_module_config.html
index 25ebd2f1a..679ae3b46 100644
--- a/modules/editor/tpl/editor_module_config.html
+++ b/modules/editor/tpl/editor_module_config.html
@@ -1,6 +1,7 @@
 <!--%import("filter/insert_editor_module_config.xml")-->
 <load target="js/editor_module_config.js" usecdn="true" />
-<form action="./" method="post" onsubmit="return procFilter(this, insert_editor_module_config)" class="form">
+<form action="./" method="post" class="form">
+	<input type="hidden" name="act" value="procEditorInsertModuleConfig" />
 	<input type="hidden" name="module" value="editor" />
 	<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
     <h3 class="h3">{$lang->editor}</h3>