diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php
index 5ce3bc9bb..5cdc13388 100644
--- a/modules/addon/addon.admin.controller.php
+++ b/modules/addon/addon.admin.controller.php
@@ -92,75 +92,35 @@
 				$this->makeCacheFile(0, 'mobile', 'site');
 			}
 
-			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAddonAdminIndex'));
+			if (Context::get('success_return_url'))
+			{
+				$this->setRedirectUrl(Context::get('success_return_url'));
+			}
+			else
+			{
+				$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAddonAdminIndex'));
+			}
 		}
 
         /**
          * @brief Add active/inactive change
          **/
         function procAddonAdminToggleActivate() {
-            $oAddonModel = &getAdminModel('addon');
-            $site_module_info = Context::get('site_module_info');
-			
-			$pc = Context::get('pc');
-			$mobile = Context::get('mobile');
+			$oAddonModel = &getAdminModel('addon');
 
-			if (!$pc) $pc = array();
-			if (!$mobile) $mobile = array();
-
-			if (!is_array($pc)) $pc = array($pc);
-			if (!is_array($mobile)) $pc = array($mobile);
-			
-			// get current addon info
-			$oModel = &getAdminModel('addon');
-			$currentAddonList = $oModel->getAddonList($site_module_info->site_srl, 'site');
-			
-			// get need update addon list
-			$updateList = array();
-			foreach($currentAddonList as $addon)
-			{
-				if ($addon->activated !== in_array($addon->addon_name, $pc))
-				{
-					$updateList[] = $addon->addon_name;
-					continue;
-				}
-
-				if ($addon->mactivated !== in_array($addon->addon_name, $mobile))
-				{
-					$updateList[] = $addon->addon_name;
-					continue;
-				}
+			$site_module_info = Context::get('site_module_info');
+			// batahom addon values
+			$addon = Context::get('addon');
+			$type = Context::get('type');
+			if(!$type) $type = "pc";
+			if($addon) {
+				// If enabled Disables
+				if($oAddonModel->isActivatedAddon($addon, $site_module_info->site_srl, $type)) $this->doDeactivate($addon, $site_module_info->site_srl, $type);
+				// If it is disabled Activate
+				else $this->doActivate($addon, $site_module_info->site_srl, $type);
 			}
 
-			// update
-			foreach($updateList as $targetAddon)
-			{
-				unset($args);
-
-				if (in_array($targetAddon, $pc))
-					$args->is_used = 'Y';
-				else
-					$args->is_used = 'N';
-
-				if (in_array($targetAddon, $mobile))
-					$args->is_used_m = 'Y';
-				else
-					$args->is_used_m = 'N';
-
-				$args->addon = $targetAddon;
-				$args->site_srl = $site_module_info->site_srl;
-
-				$output = executeQuery('addon.updateSiteAddon', $args);
-				if (!$output->toBool()) return $output;
-			}
-
-			if (count($updateList))
-			{
-            	$this->makeCacheFile($site_module_info->site_srl, 'pc', 'site');
-	            $this->makeCacheFile($site_module_info->site_srl, 'mobile', 'site');	
-			}
-
-			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'homepage', 'act', 'dispHomepageComponent'));
+			$this->makeCacheFile($site_module_info->site_srl, $type);
         }
 
         /**
diff --git a/modules/addon/addon.admin.view.php b/modules/addon/addon.admin.view.php
index c95b49439..1dc31eaa7 100644
--- a/modules/addon/addon.admin.view.php
+++ b/modules/addon/addon.admin.view.php
@@ -75,6 +75,12 @@
             // Template specifies the path and file
             $this->setTemplateFile('setup_addon');
 
+			if(Context::get('module') != 'admin')
+			{
+				$this->setLayoutPath('./common/tpl');
+				$this->setLayoutFile('popup_layout');
+			}
+
 			$security = new Security();
 			$security->encodeHTML('addon_info.', 'addon_info.author..', 'mid_list....');
         }
diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html
index d18c3f868..79ebb8bc3 100644
--- a/modules/addon/tpl/addon_list.html
+++ b/modules/addon/tpl/addon_list.html
@@ -1,6 +1,7 @@
 <form action="./" method="post">
 	<input type="hidden" name="module" value="addon" />
 	<input type="hidden" name="act" value="procAddonAdminSaveActivate" />
+	<input type="hidden" name="sccess_return_url" value="{getRequestUriByServerEnviroment()}" />
 
 	<h1 class="h1">{$lang->installed_addon}</h1>
 	<p>{$lang->about_installed_addon}</p>
@@ -50,4 +51,4 @@
 	<div class="btnArea">
 		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
 	</div>
-</form>
\ No newline at end of file
+</form>