diff --git a/javascript/CMSMain.js b/javascript/CMSMain.js
index a55740a3..769e822d 100644
--- a/javascript/CMSMain.js
+++ b/javascript/CMSMain.js
@@ -20,9 +20,6 @@
 			});
 
 			this._resizeChildren();
-			
-			// save cookie state of all tabs
-			$('.ss-tabset').tabs('option', 'cookie', { expires: 30 });
 
 			this._super();
 		},
diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index fd8b3e04..3e267de0 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -220,7 +220,8 @@
 			// All tab contents are closed by default.
 			this.tabs({
 				collapsible: true,
-				selected: null
+				selected: parseInt(jQuery.cookie('ui-tabs-TreeActions')) || null,
+				cookie: { expires: 30, path: '/', name: 'ui-tabs-TreeActions' }
 			});
 		}
 	}});