diff --git a/admin/javascript/LeftAndMain.Preview.js b/admin/javascript/LeftAndMain.Preview.js
index ab082c442..d421250c2 100644
--- a/admin/javascript/LeftAndMain.Preview.js
+++ b/admin/javascript/LeftAndMain.Preview.js
@@ -67,7 +67,10 @@
 				if(this.is('.is-collapsed')) return;
 
 				// var url = ui.xmlhttp.getResponseHeader('x-frontend-url');
-				var url = $('.cms-edit-form').find(':input[name=PreviewURL],:input[name=StageURLSegment]').val();
+				var url = $('.cms-edit-form')
+					.find(':input[name=PreviewURL],:input[name=StageLink],:input[name=LiveLink]')
+					.filter(function() {return $(this).val() !== '';})
+					.val();
 				if(url) {
 					this.loadUrl(url);
 					this.unblock();
@@ -294,7 +297,11 @@
 			onclick: function(e) {
 				e.preventDefault();
 				
-				var preview = $('.cms-preview'), url = $('.cms-edit-form').find(':input[name=PreviewURL],:input[name=StageURLSegment]').val();
+				var preview = $('.cms-preview'), 
+					url = $('.cms-edit-form')
+						.find(':input[name=PreviewURL],:input[name=StageLink],:input[name=LiveLink]')
+						.filter(function() {return $(this).val() !== '';})
+						.val();
 				if(url) {
 						preview.loadUrl(url);
 						preview.unblock();