diff --git a/_config.php b/_config.php
index ddd1629b..c6093d41 100644
--- a/_config.php
+++ b/_config.php
@@ -13,6 +13,11 @@ Director::addRules(50, array(
 	'dev/buildcache/$Action' => 'RebuildStaticCacheTask',
 ));
 
+// Default to "pages" view unless a URLSegment within /admin is specified
+Director::addRules(20, array(
+	'admin//$action/$ID/$OtherID' => '->admin/pages'
+));
+
 Director::addRules(1, array(
 	'$URLSegment//$Action/$ID/$OtherID' => 'ModelAsController',
 ));
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 62db4d63..303c7bff 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -11,7 +11,7 @@
  */
 class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionProvider {
 	
-	static $url_segment = '';
+	static $url_segment = 'page';
 	
 	static $url_rule = '/$Action/$ID/$OtherID';
 	
diff --git a/tests/controller/CMSMainTest.php b/tests/controller/CMSMainTest.php
index d1511756..8f89530e 100644
--- a/tests/controller/CMSMainTest.php
+++ b/tests/controller/CMSMainTest.php
@@ -62,7 +62,7 @@ class CMSMainTest extends FunctionalTest {
 		//$this->assertRegexp('/Done: Published 4 pages/', $response->getBody())
 			
 		/*
-		$response = Director::test("admin/publishitems", array(
+		$response = Director::test("admin/page/publishitems", array(
 			'ID' => ''
 			'Title' => ''
 			'action_publish' => 'Save and publish',
@@ -187,7 +187,7 @@ class CMSMainTest extends FunctionalTest {
 	function testDeletedPagesSiteTreeFilter() {
 		$id = $this->idFromFixture('Page', 'page3');
 		$this->logInWithPermission('ADMIN');
-		$result = $this->get('admin/getsubtree?filter=CMSSiteTreeFilter_DeletedPages&ajax=1&ID=' . $id);
+		$result = $this->get('admin/pages/getsubtree?filter=CMSSiteTreeFilter_DeletedPages&ajax=1&ID=' . $id);
 		$this->assertEquals(200, $result->getStatusCode());
 	}
 	
diff --git a/tests/search/CMSMainSearchFormTest.php b/tests/search/CMSMainSearchFormTest.php
index 03d94dd2..fb917407 100644
--- a/tests/search/CMSMainSearchFormTest.php
+++ b/tests/search/CMSMainSearchFormTest.php
@@ -9,7 +9,7 @@ class CMSMainSearchFormTest extends FunctionalTest {
 		$this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
 
 		$response = $this->get(
-			'admin/SearchForm/?' .
+			'admin/page/SearchForm/?' .
 			http_build_query(array(
 				'Title' => 'Page 10',
 				'FilterClass' => 'CMSSiteTreeFilter_Search',