diff --git a/javascript/TabSet.js b/javascript/TabSet.js
index 1b61ad27859..56ebaff4217 100644
--- a/javascript/TabSet.js
+++ b/javascript/TabSet.js
@@ -12,7 +12,7 @@
 
 			// Initialize jQuery UI tabs
 			this.tabs({
-				cookie: $.cookie ? { expires: 30, path: '/' } : false
+				cookie: $.cookie ? { expires: 30, path: '/', name: 'ui-tabs-' + this.attr('id') } : false
 			});
 		},
 			
@@ -26,7 +26,7 @@
 			$(this).find('ul a').each(function() {
 				var href = $(this).attr('href').replace(/.*(#.*)/, '$1');
 				if(href) $(this).attr('href', href);
-			})
+			});
 		}
 	});
 })(jQuery);
\ No newline at end of file
diff --git a/templates/TabSetFieldHolder.ss b/templates/TabSetFieldHolder.ss
index 303e6613721..3117242ed34 100644
--- a/templates/TabSetFieldHolder.ss
+++ b/templates/TabSetFieldHolder.ss
@@ -1,4 +1,4 @@
-<div class="ss-tabset">
+<div class="ss-tabset" id="$id">
 	<ul>
 	<% control Tabs %>
 		<li class="$FirstLast $MiddleString"><a href="#$id" id="tab-$id">$Title</a></li>