diff --git a/ui/marks.js b/ui/marks.js
index efe560a5..e86b6808 100755
--- a/ui/marks.js
+++ b/ui/marks.js
@@ -51,9 +51,9 @@ var toggleMarkedOnlyView = createCSSClassToggler(
 		'marked-only-view cropped-mode',
 		function(action){
 			// prevent mixing marked-only and single-ribbon modes...
-			// XXX is there a more generic way to do this???
-			// 		..without including direct mode dependencies?
-			if(action == 'on' && toggleSingleRibbonMode('?') == 'on'){
+			if(action == 'on' 
+					&& $('.viewer').hasClass('cropped-mode') 
+					&& toggleMarkedOnlyView('?') != 'on'){
 				return false
 			}
 		},
diff --git a/ui/modes.js b/ui/modes.js
index d1e63ade..189148fc 100755
--- a/ui/modes.js
+++ b/ui/modes.js
@@ -178,9 +178,9 @@ var toggleSingleRibbonMode = createCSSClassToggler(
 		'single-ribbon-mode cropped-mode',
 		function(action){
 			// prevent mixing marked-only and single-ribbon modes...
-			// XXX is there a more generic way to do this???
-			// 		..without including direct mode dependencies?
-			if(action == 'on' && toggleMarkedOnlyView('?') == 'on'){
+			if(action == 'on' 
+					&& $('.viewer').hasClass('cropped-mode') 
+					&& toggleSingleRibbonMode('?') != 'on'){
 				return false
 			}
 		},