diff --git a/themes/default/js/product.js b/themes/default/js/product.js
index fc55829ed..f54f9aec5 100644
--- a/themes/default/js/product.js
+++ b/themes/default/js/product.js
@@ -704,6 +704,7 @@ function checkUrl()
 			product_id = $('#product_page_product_id').val();
 			// fill html with values
 			$('.color_pick').removeClass('selected');
+			$('.color_pick').parent().parent().children().removeClass('selected');
 			count = 0;
 			for (z in tabValues)
 				for (a in attributesCombinations)
diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index 3ed595535..8d7f42576 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -290,7 +290,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
 								<ul id="color_to_pick_list" class="clearfix">
 									{assign var="default_colorpicker" value=""}
 									{foreach from=$group.attributes key=id_attribute item=group_attribute}
-									<li>
+									<li{if $group.default == $id_attribute} class="selected"{/if}>
 										<a id="color_{$id_attribute|intval}" class="color_pick{if ($group.default == $id_attribute)} selected{/if}" style="background: {$colors.$id_attribute.value};" title="{$colors.$id_attribute.name}" onclick="colorPickerClick(this);getProductAttribute();{if $colors|@count > 0}$('#wrapResetImages').show('slow');{/if}">
 											{if file_exists($col_img_dir|cat:$id_attribute|cat:'.jpg')}
 												<img src="{$img_col_dir}{$id_attribute}.jpg" alt="{$colors.$id_attribute.name}" width="20" height="20" /><br>