diff --git a/classes/AdminTab.php b/classes/AdminTab.php
index 8d315eb6e..48c937efa 100644
--- a/classes/AdminTab.php
+++ b/classes/AdminTab.php
@@ -1891,7 +1891,7 @@ abstract class AdminTabCore
 				echo (isset($field['desc']) ? '<p class="preference_description">'.$field['desc'].'</p>' : '');
 
 				// Is this field invisible in current shop context ?
-				echo ($isInvisible) ? '<p><img src="../img/admin/warning.gif" /> <b>'.$this->l('You can\'t change the value of this configuration field in this shop context').'</b></p>' : '';
+				echo ($isInvisible) ? '<p class="multishop_warning">'.$this->l('You can\'t change the value of this configuration field in this shop context').'</p>' : '';
 				
 				echo '</div></div>';
 			}
diff --git a/css/admin.css b/css/admin.css
index c140d16b2..b6c87cb13 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -1627,12 +1627,20 @@ p.preference_description{
 	font-style: italic;
 }
 
+.multishop_warning{
+    background-image: url("../img/admin/warning.gif");
+    background-repeat: no-repeat;
+    color: #FE2744;
+    font-weight: bold;
+    padding-left: 22px;
+    padding-top: 1px;
+}
+
 .isDisabled{
 	color: #3F3F3F;
 	font-style: italic;
 }
 
-input.disable_me[disabled=disabled]
-{
+input.disable_me[disabled=disabled]{
 	background-color: red;
 }
\ No newline at end of file
diff --git a/js/admin.js b/js/admin.js
index 8bf510091..e152a7350 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -829,6 +829,12 @@ function trackClickOnHelp(label, doc_version)
 
 $(document).ready(function()
 {
+	$('.isInvisible input, .isInvisible select, .isInvisible textarea').each(function(k, v)
+	{
+		$(v).attr('disabled', true);
+	});
+	
+	// Disable options fields for each row with a multishop default checkbox
 	$('.preference_default_multishop input[type=checkbox]').each(function(k, v)
 	{
 		var key = $(v).attr('name');