diff --git a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
index a8a1f2d52..2eea8aedd 100644
--- a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
@@ -28,9 +28,15 @@
 	{if $field['type'] == 'maintenance_ip'}
 		{$field['script_ip']}
 		<div class="col-lg-9 ">
-			<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+			<div class="row">
+				<div class="col-lg-8">
+					<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+				</div>
+				<div class="col-lg-1">
+					{$field['link_remove_ip']}
+				</div>
+			</div>
 		</div>
-		{$field['link_remove_ip']}
 	{else}
 		{$smarty.block.parent}
 	{/if}
diff --git a/classes/helper/HelperOptions.php b/classes/helper/HelperOptions.php
index 56036dc71..4d729e1a9 100644
--- a/classes/helper/HelperOptions.php
+++ b/classes/helper/HelperOptions.php
@@ -132,7 +132,7 @@ class HelperOptionsCore extends Helper
 									$(\'input[name=PS_MAINTENANCE_IP]\').attr(\'value\',\''.Tools::getRemoteAddr().'\');
 							}
 						</script>';
-					$field['link_remove_ip'] = ' &nbsp<div class="col-lg-9 col-lg-offset-3"><a href="#" class="btn btn-default" onclick="addRemoteAddr(); return false;"><i class="icon-plus"></i> '.$this->l('Add my IP', 'Helper').'</a></div>';
+					$field['link_remove_ip'] = '<button type="button" class="btn btn-default" onclick="addRemoteAddr();"><i class="icon-plus"></i> '.$this->l('Add my IP', 'Helper').'</button>';
 				}
 
 				// Multishop default value