diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
index 9303541c98ae3..afdc6a6bbfa03 100644
--- a/administrator/components/com_plugins/views/plugin/tmpl/edit.php
+++ b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
@@ -17,22 +17,30 @@
 JHtml::_('bootstrap.tooltip');
 $this->fieldsets = $this->form->getFieldsets('params');
 
+$input = JFactory::getApplication()->input;
+
+// In case of modal
+$isModal  = $input->get('layout') === 'modal' ? true : false;
+$layout   = $isModal ? 'modal' : 'edit';
+$tmpl     = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
+
 JFactory::getDocument()->addScriptDeclaration("
-	Joomla.submitbutton = function(task)
-	{
-		if (task == 'plugin.cancel' || document.formvalidator.isValid(document.getElementById('style-form'))) {
+	Joomla.submitbutton = function(task) {
+		if (task === 'plugin.cancel' || document.formvalidator.isValid(document.getElementById('style-form'))) {
 			Joomla.submitform(task, document.getElementById('style-form'));
-		}
-		
-		if (self !== top) {
-			window.top.setTimeout('window.parent.location = window.top.location.href', 1000);
-			window.parent.jQuery('#plugin" . $this->item->extension_id . "Modal').modal('hide');
+
+			if (task !== 'plugin.apply') {
+				if (self !== top ) {
+					window.top.setTimeout('window.parent.location = window.top.location.href', 1000);
+					window.parent.jQuery('#plugin" . $this->item->extension_id . "Modal').modal('hide');
+				}
+			}
 		}
 	};
 ");
 ?>
 
-<form action="<?php echo JRoute::_('index.php?option=com_plugins&layout=edit&extension_id=' . (int) $this->item->extension_id); ?>" method="post" name="adminForm" id="style-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_plugins&view=plugin&layout=' . $layout . $tmpl . '&extension_id=' . (int) $this->item->extension_id); ?>" method="post" name="adminForm" id="style-form" class="form-validate">
 	<div class="form-horizontal">
 
 		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
@@ -149,3 +157,4 @@
 	<input type="hidden" name="task" value="" />
 	<?php echo JHtml::_('form.token'); ?>
 </form>
+
diff --git a/administrator/components/com_plugins/views/plugin/tmpl/modal.php b/administrator/components/com_plugins/views/plugin/tmpl/modal.php
index 69d18a30cd77f..b8e4f6dcf2355 100644
--- a/administrator/components/com_plugins/views/plugin/tmpl/modal.php
+++ b/administrator/components/com_plugins/views/plugin/tmpl/modal.php
@@ -18,9 +18,12 @@
 	});
 ');
 ?>
+<button id="applyBtn" type="button" class="hidden" onclick="Joomla.submitbutton('plugin.apply');"></button>
 <button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitbutton('plugin.save');"></button>
 <button id="closeBtn" type="button" class="hidden" onclick="Joomla.submitbutton('plugin.cancel');"></button>
 
-<?php
-$this->setLayout('edit');
-echo $this->loadTemplate();
+<div class="container-popup">
+	<?php $this->setLayout('edit'); ?>
+	<?php echo $this->loadTemplate(); ?>
+</div>
+
diff --git a/administrator/components/com_redirect/views/links/tmpl/default.php b/administrator/components/com_redirect/views/links/tmpl/default.php
index deee669f35ef6..6e185baa2ce04 100644
--- a/administrator/components/com_redirect/views/links/tmpl/default.php
+++ b/administrator/components/com_redirect/views/links/tmpl/default.php
@@ -31,16 +31,19 @@
 				array(
 					'url'        => $link,
 					'title'      => JText::_('COM_REDIRECT_EDIT_PLUGIN_SETTINGS'),
-					'height'     => '400px',
-					'modalWidth' => '60',
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
 					'closeButton' => false,
 					'backdrop'    => 'static',
 					'keyboard'    => false,
-					'footer'     => '<button type="button" class="btn" data-dismiss="modal" aria-hidden="true"'
-						. ' onclick="jQuery(\'#plugin' . $this->redirectPluginId . 'Modal iframe\').contents().find(\'#closeBtn\').click();">'
-						. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
-						. '<button class="btn btn-success" data-dismiss="modal" aria-hidden="true" onclick="jQuery(\'#plugin' . $this->redirectPluginId . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
+					'footer'     => '<button class="btn" data-dismiss="modal" aria-hidden="true">'
+						. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
+						. '<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" onclick="jQuery(\'#plugin' . $this->redirectPluginId . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
 						. JText::_("JSAVE") . '</button>'
+						. '<button class="btn btn-success" aria-hidden="true" onclick="jQuery(\'#plugin' . $this->redirectPluginId . 'Modal iframe\').contents().find(\'#applyBtn\').click(); return false;">'
+						. JText::_("JAPPLY") . '</button>'
 				)
 			); ?>
 		<?php endif; ?>
@@ -166,3 +169,4 @@
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>
+