diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index c5aeaebd..001f5a6d 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -511,7 +511,7 @@ class LeftAndMain extends Controller {
 		// Wrap the root if needs be.
 
 		if(!$rootID) {
-			$rootLink = $this->Link() . '0';
+			$rootLink = '#';
 			
 			// This lets us override the tree title with an extension
 			if($this->hasMethod('getCMSTreeTitle')) $treeTitle = $this->getCMSTreeTitle();
diff --git a/javascript/LeftAndMain.EditForm.js b/javascript/LeftAndMain.EditForm.js
index 3c77885e..fe0d4a5c 100644
--- a/javascript/LeftAndMain.EditForm.js
+++ b/javascript/LeftAndMain.EditForm.js
@@ -17,10 +17,10 @@
 		return/** @lends ss.Form_EditForm */{	
 			
 			/**
-			 * @type String HTML text to show when the form has been deleted.
-			 * @todo i18n
+			 * @type String HTML text to show when no form content is chosen.
+			 *  Will show inside the <form> tag.
 			 */
-			RemoveText: 'Removed',
+			PlaceholderHtml: '',
 			
 			/**
 			 * @type Object
@@ -31,10 +31,15 @@
 				var self = this;
 				
 				this._setupChangeTracker();
-				
+
 				// Can't bind this through jQuery
 				window.onbeforeunload = function(e) {return self._checkChangeTracker(false);};
 				
+				// set default placeholder if form has no children
+				this.setPlaceholderHtml(jQuery('.ss-cmsForm-welcomeMessage').html());
+				jQuery('.ss-cmsForm-welcomeMessage').remove();
+				if(!self.find('*').length) self.removeForm();
+				
 				$._super();
 			},
 			
diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js
index acaa8274..f816ceb1 100755
--- a/javascript/LeftAndMain_left.js
+++ b/javascript/LeftAndMain_left.js
@@ -199,17 +199,19 @@ TreeAPI.prototype = {
 TreeNodeAPI = Class.create();
 TreeNodeAPI.prototype = {
 	selectTreeNode : function() {
-		if(this.getElementsByTagName('a')[0].href) {
+		var url = jQuery(this).find('a').attr('href');
+		if(url && url != '#') {
 			_AJAX_LOADING = true;
 			if($('sitetree').notify('SelectionChanged', this)) {
 		    this.getPageFromServer();
 			}
+		} else {
+			jQuery('#Form_EditForm').concrete('ss').removeForm();
 		}
 	},
 		
 	getPageFromServer : function() {
 		var self = this;
-		
 		var xmlhttp = jQuery('#Form_EditForm').concrete('ss').load(
 			jQuery(this).find('a').attr('href'),
 			function(response) {
diff --git a/templates/Includes/CMSMain_right.ss b/templates/Includes/CMSMain_right.ss
index 1f0a92ac..d7e64445 100755
--- a/templates/Includes/CMSMain_right.ss
+++ b/templates/Includes/CMSMain_right.ss
@@ -1,12 +1,14 @@
+<div class='ss-cmsForm-welcomeMessage'>
+	<h1>$ApplicationName</h1>
+	<p>
+		<% _t('WELCOMETO','Welcome to') %> $ApplicationName! 
+		<% _t('CHOOSEPAGE','Please choose a page from the left.') %>
+	</p>
+</div>
 <% if EditForm %>
 	$EditForm
 <% else %>
-	<form id="Form_EditForm" action="admin?executeForm=EditForm" method="post" enctype="multipart/form-data">
-		<h1>$ApplicationName</h1>
-		<p>
-			<% _t('WELCOMETO','Welcome to') %> $ApplicationName! 
-			<% _t('CHOOSEPAGE','Please choose a page from the left.') %>
-		</p>
+	<form id="Form_EditForm" action="admin/EditForm" method="post" enctype="multipart/form-data">
 	</form>
 <% end_if %>