diff --git a/admin-dev/themes/default/template/controllers/products/form.tpl b/admin-dev/themes/default/template/controllers/products/form.tpl
index 4547206c0..af57b9281 100644
--- a/admin-dev/themes/default/template/controllers/products/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/form.tpl
@@ -201,7 +201,9 @@
 					displayTabProductById(id, true, 0, null);
 				else
 				{
-					$("#product-tab-content-"+id).show();
+					$("#product-tab-content-"+id).show(0, function(){
+						$(this).trigger('displayed');
+					});
 					$("#link-"+id).addClass('selected');
 				}
 
diff --git a/admin-dev/themes/default/template/controllers/products/suppliers.tpl b/admin-dev/themes/default/template/controllers/products/suppliers.tpl
index 91133c129..42fa7d482 100644
--- a/admin-dev/themes/default/template/controllers/products/suppliers.tpl
+++ b/admin-dev/themes/default/template/controllers/products/suppliers.tpl
@@ -127,7 +127,7 @@
 	</div>
 
 	<script type="text/javascript">
-		$(function() {
+		$(document).ready(function() {
 			var default_is_ok = false;
 
 			var manageDefaultSupplier = function() {
@@ -192,9 +192,16 @@
 
 			});
 
+			// @TODO: a better way to fix the accordion wrong size bug when the selected page is this page
 			setTimeout(function() {
 				$('#suppliers_accordion').accordion();
 			}, 500);
+
+			// Resize the accordion once the page is visible because of the bug with accordions initialized
+			// inside a display:none block not having the correct size.
+			$('#suppliers_accordion').parents('.product-tab-content').bind('displayed', function(){
+				$('#suppliers_accordion').accordion("resize");
+			});
 		});
 	</script>
 
diff --git a/admin-dev/themes/default/template/controllers/products/warehouses.tpl b/admin-dev/themes/default/template/controllers/products/warehouses.tpl
index 763806f95..c7255a50a 100644
--- a/admin-dev/themes/default/template/controllers/products/warehouses.tpl
+++ b/admin-dev/themes/default/template/controllers/products/warehouses.tpl
@@ -86,7 +86,7 @@
 	<p>&nbsp;</p>
 
 	<script type="text/javascript">
-		$(function() {
+		$(document).ready(function() {
 			$('.check_all_warehouse').click(function() {
 				var check = $(this);
 				//get all checkboxes of current warehouse
@@ -107,10 +107,16 @@
 				}
 			});
 
-			setTimeout(function() {
-				$('#warehouse_accordion').accordion();
-			}, 500);
+		// @TODO: a better way to fix the accordion wrong size bug when the selected page is this page
+		setTimeout(function() {
+			$('#warehouse_accordion').accordion();
+		}, 500);
+
+		// Resize the accordion once the page is visible because of the bug with accordions initialized
+		// inside a display:none block not having the correct size.
+		$('#warehouse_accordion').parents('.product-tab-content').bind('displayed', function(){
+			$('#warehouse_accordion').accordion("resize");
+		});
 		});
 	</script>
-
 {/if}
\ No newline at end of file
diff --git a/js/admin-products.js b/js/admin-products.js
index 347aa3fc9..0e6c7f593 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -224,8 +224,9 @@ function editProductAttribute(ids, token)
 function displayTabProductById(id, selected, index, stack)
 {
 	var myurl = $('#link-'+id).attr("href")+"&ajax=1";
+	var tab_selector = $("#product-tab-content-"+id);
 	// Used to check if the tab is already in the process of being loaded
-	$("#product-tab-content-"+id).addClass('loading');
+	tab_selector.addClass('loading');
 
 	if (selected)
 		$('#product-tab-content-wait').show();
@@ -236,22 +237,24 @@ function displayTabProductById(id, selected, index, stack)
 		cache: false, // cache needs to be set to false or IE will cache the page with outdated product values
 		success : function(data)
 		{
-			$("#product-tab-content-"+id).html(data);
-			$("#product-tab-content-"+id).removeClass('not-loaded');
+			tab_selector.html(data);
+			tab_selector.removeClass('not-loaded');
 
 			if (selected)
 			{
 				$("#link-"+id).addClass('selected');
-				$("#product-tab-content-"+id).show();
+				tab_selector.show();
 			}
 		},
 		complete : function(data)
 		{
 			$("#product-tab-content-"+id).removeClass('loading');
 			if (selected)
+			{
 				$('#product-tab-content-wait').hide();
-
-			$("#product-tab-content-"+id).trigger('loaded');
+				tab_selector.trigger('displayed');
+			}
+			tab_selector.trigger('loaded');
 			if (stack && stack[index + 1])
 				displayTabProductById(stack[index + 1], selected, index + 1, stack);
 		},
@@ -372,5 +375,4 @@ $(document).ready(function() {
 	});
 
 	// Enable writing of the product name when the friendly url field in tab SEO is loaded
-	onTabLoad('Seo', enableProductName);
 });