diff --git a/_config.php b/_config.php
index fe375184..b4cf76ec 100644
--- a/_config.php
+++ b/_config.php
@@ -28,4 +28,8 @@ else SS_Report::register('ReportAdmin', 'BrokenLinksReport',-20);
  */
 ShortcodeParser::get('default')->register('sitetree_link', array('SiteTree', 'link_shortcode_handler'));
 
-Object::add_extension('File', 'SiteTreeFileExtension');
\ No newline at end of file
+Object::add_extension('File', 'SiteTreeFileExtension');
+
+// TODO Remove once we can configure CMSMenu through static, nested configuration files
+CMSMenu::remove_menu_item('CMSPageEditController');
+CMSMenu::remove_menu_item('CMSPageSettingsController');
\ No newline at end of file
diff --git a/code/controller/CMSPageEditController.php b/code/controller/CMSPageEditController.php
new file mode 100644
index 00000000..47dfe085
--- /dev/null
+++ b/code/controller/CMSPageEditController.php
@@ -0,0 +1,13 @@
+<?php
+class CMSPageEditController extends CMSMain {
+
+	static $url_segment = 'page/edit';
+	static $url_rule = '/$Action/$ID/$OtherID';
+	static $url_priority = 41;
+	
+	function getEditForm($id = null, $fields = null) {
+		$record = $this->getRecord($id ? $id : $this->currentPageID());
+		return parent::getEditForm($record, ($record) ? $record->getCMSFields() : null);
+	}
+	
+}
\ No newline at end of file
diff --git a/code/controller/CMSPageSettingsController.php b/code/controller/CMSPageSettingsController.php
new file mode 100644
index 00000000..dc19a2cd
--- /dev/null
+++ b/code/controller/CMSPageSettingsController.php
@@ -0,0 +1,13 @@
+<?php
+class CMSPageSettingsController extends CMSMain {
+
+	static $url_segment = 'page/settings';
+	static $url_rule = '/$Action/$ID/$OtherID';
+	static $url_priority = 42;
+		
+	function getEditForm($id = null, $fields = null) {
+		$record = $this->getRecord($id ? $id : $this->currentPageID());
+		return parent::getEditForm($record, ($record) ? $record->getSettingsFields() : null);
+	}
+	
+}
\ No newline at end of file