diff --git a/code/controllers/CMSPagesController.php b/code/controllers/CMSPagesController.php
index 62180d60..5f401d7a 100644
--- a/code/controllers/CMSPagesController.php
+++ b/code/controllers/CMSPagesController.php
@@ -15,6 +15,13 @@ class CMSPagesController extends CMSMain {
 		return false;
 	}
 
+	/**
+	 * @return String
+	 */
+	public function ViewState() {
+		return $this->request->getVar('view');
+	}
+
 	/**
 	 * Doesn't deal with a single record, and we need
 	 * to avoid session state from previous record edits leaking in here.
diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
index 0b056d91..131d93bd 100644
--- a/templates/Includes/CMSPagesController_Content.ss
+++ b/templates/Includes/CMSPagesController_Content.ss
@@ -9,10 +9,10 @@
 		
 			<div class="cms-content-header-tabs">
 				<ul>
-					<li class="content-treeview">
+					<li class="content-treeview<% if ViewState == tree %> ui-tabs-selected<% end_if %>">
 						<a href="#cms-content-treeview" class="cms-panel-link" data-href="$LinkTreeView"><% _t('CMSPagesController.TreeView', 'Tree View') %></a>
 					</li>
-					<li class="content-listview">
+					<li class="content-listview<% if ViewState == list %> ui-tabs-selected<% end_if %>">
 						<a href="#cms-content-listview" class="cms-panel-link" data-href="$LinkListView"><% _t('CMSPagesController.ListView', 'List View') %></a>
 					</li>
 					<!--