diff --git a/editor.html b/editor.html
index 130bb73..c5b6ee5 100755
--- a/editor.html
+++ b/editor.html
@@ -95,10 +95,20 @@ $(document).ready(function(){
 
 			// XXX for some reason this deos not bubble up the nested elements...
 			click: function(evt, elem){
-				if($(elem).hasClass('page')){
+				elem = $(elem)
+				// bubble up to nearest page...
+				if(!elem.hasClass('page') 
+						&& elem.parents('.page').length != 0){
+					elem = elem.parents('.page').first()
+				}
+
+				// click current page to toggle full page view...
+				if(elem.hasClass('current', 'page') 
+						&& togglePageView('?') == 'off'){
+					togglePageView('on')
+				// click any page to set it to current...
+				} else if(elem.hasClass('page')){
 					setCurrentPage(elem)
-				} else if($(elem).parents('.page').length != 0){
-					setCurrentPage($(elem).parents('.page').first())
 				}
 				return true
 			},
diff --git a/index.html b/index.html
index 5ee21b9..5b3fb7f 100755
--- a/index.html
+++ b/index.html
@@ -90,10 +90,20 @@ $(document).ready(function(){
 			// XXX just stopped working....
 			//		...works if we double click but not on a single click...
 			click: function(evt, elem){
-				if($(elem).hasClass('page')){
+				elem = $(elem)
+				// bubble up to nearest page...
+				if(!elem.hasClass('page') 
+						&& elem.parents('.page').length != 0){
+					elem = elem.parents('.page').first()
+				}
+
+				// click current page to toggle full page view...
+				if(elem.hasClass('current', 'page') 
+						&& togglePageView('?') == 'off'){
+					togglePageView('on')
+				// click any page to set it to current...
+				} else if(elem.hasClass('page')){
 					setCurrentPage(elem)
-				} else if($(elem).parents('.page').length != 0){
-					setCurrentPage($(elem).parents('.page').first())
 				}
 				return true
 			},