diff --git a/plugins/shorten_expanded/init.css b/plugins/shorten_expanded/init.css
index 5e1bfa8f3..ed5116872 100644
--- a/plugins/shorten_expanded/init.css
+++ b/plugins/shorten_expanded/init.css
@@ -1,7 +1,7 @@
 div.contentSizeWrapper {
 	overflow : hidden;
 	text-overflow: ellipsis;
-	height : 700px;
+	/*height : 700px;*/
 }
 
 button.expandPrompt {
diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index ba82b643b..11ecbc5d5 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -1,4 +1,4 @@
-var _shorten_expanded_threshold = 900; //px, longer than css height so that we would only clip articles significantly longer than limit
+var _shorten_expanded_threshold = 1.5; //window heights
 
 function expandSizeWrapper(id) {
 	try {
@@ -28,11 +28,13 @@ dojo.addOnLoad(function() {
 
 			window.setTimeout(function() {
 				if (row) {
-					if (row.offsetHeight >= _shorten_expanded_threshold) {
+					if (row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
 						var content = row.select(".cdmContentInner")[0];
 
 						if (content) {
-							content.innerHTML = "<div class='contentSizeWrapper'>" +
+							var wrapperHeight = Math.round(window.innerHeight * 0.8) + 'px';
+
+							content.innerHTML = "<div class='contentSizeWrapper' style='height : "+wrapperHeight+"'>" +
 								content.innerHTML + "</div><button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' "+
 								"href='#'>" + __("Click to expand article") + "</button>";