diff --git a/admin/javascript/LeftAndMain.EditForm.js b/admin/javascript/LeftAndMain.EditForm.js
index cc017a5fe..889553436 100644
--- a/admin/javascript/LeftAndMain.EditForm.js
+++ b/admin/javascript/LeftAndMain.EditForm.js
@@ -40,6 +40,27 @@
 				var self = this;
 			
 				this._setupChangeTracker();
+				
+				$('.cms-tree').bind('select_node.jstree', function(e, data) {
+					var node = data.rslt.obj, loadedNodeID = self.find(':input[name=ID]').val()
+					
+					// Don't allow checking disabled nodes
+					if($(node).hasClass('disabled')) return false;
+
+					// Don't allow reloading of currently selected node,
+					// mainly to avoid doing an ajax request on initial page load
+					if($(node).data('id') == loadedNodeID) return;
+
+					var url = $(node).find('a:first').attr('href');
+					if(url && url != '#') {
+						var xmlhttp = self.loadForm(
+							url,
+							function(response) {}
+						);
+					} else {
+						self.removeForm();
+					}
+				});
 
 				// Can't bind this through jQuery
 				window.onbeforeunload = function(e) {return self._checkChangeTracker(false);};
diff --git a/admin/javascript/LeftAndMain.Tree.js b/admin/javascript/LeftAndMain.Tree.js
index 86cf66f56..92c88e9fd 100755
--- a/admin/javascript/LeftAndMain.Tree.js
+++ b/admin/javascript/LeftAndMain.Tree.js
@@ -124,27 +124,6 @@
 								}
 							}
 						})
-						// TODO Move to EditForm logic
-						.bind('select_node.jstree', function(e, data) {
-							var node = data.rslt.obj, loadedNodeID = $('.edit-form :input[name=ID]').val()
-							
-							// Don't allow checking disabled nodes
-							if($(node).hasClass('disabled')) return false;
-
-							// Don't allow reloading of currently selected node,
-							// mainly to avoid doing an ajax request on initial page load
-							if($(node).data('id') == loadedNodeID) return;
-
-							var url = $(node).find('a:first').attr('href');
-							if(url && url != '#') {
-								var xmlhttp = $('.edit-form').loadForm(
-									url,
-									function(response) {}
-								);
-							} else {
-								$('.edit-form').removeForm();
-							}
-						})
 						.bind('move_node.jstree', function(e, data) {
 							var movedNode = data.rslt.o, newParentNode = data.rslt.np, oldParentNode = data.inst._get_parent(movedNode);
 							var siblingIDs = $.map($(movedNode).siblings().andSelf(), function(el) {