diff --git a/admin/javascript/LeftAndMain.Content.js b/admin/javascript/LeftAndMain.Content.js
index 8cf078e1a..074ed3c1e 100644
--- a/admin/javascript/LeftAndMain.Content.js
+++ b/admin/javascript/LeftAndMain.Content.js
@@ -20,7 +20,12 @@
 					// Don't trigger unless coming from a click event.
 					// Avoids problems with automated section switches from tree to detail view
 					// when JSTree auto-selects elements on first load.
-					if(!origEvent) return false;
+					if(!origEvent) {
+						return false;
+					}else if($(origEvent.target).hasClass('jstree-icon') || $(origEvent.target).hasClass('jstree-pageicon')){
+						// in case the click is not on the node title, ie on pageicon or dragicon, 
+						return false;
+					}
 					
 					// Don't allow checking disabled nodes
 					if($(node).hasClass('disabled')) return false;
diff --git a/admin/javascript/LeftAndMain.Tree.js b/admin/javascript/LeftAndMain.Tree.js
index f83f94cce..248c9d059 100644
--- a/admin/javascript/LeftAndMain.Tree.js
+++ b/admin/javascript/LeftAndMain.Tree.js
@@ -130,6 +130,7 @@
 							}
 							
 							if($.inArray(data.func, ['check_node', 'uncheck_node'])) {
+								//Don't allow check and uncheck if parent is disabled
 								var node = $(data.args[0]).parents('li:first');
 								if(node.hasClass('disabled')) {
 									e.stopImmediatePropagation();