diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index e48e3e8df6..ea034f0aff 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -78,8 +78,12 @@
 				var pos = self.parent.position();
 				self.$dialog.css({
 					left: pos.left + ($(window).innerWidth() - self.$dialog.outerWidth())/2,
-					top: pos.top + ($(window).innerHeight() - self.$dialog.outerHeight())/2
+					top: pos.top + ($(window).innerHeight() - self.$dialog.outerHeight())/2,
+					width: Math.min(self.options.width, $(window).innerWidth() - 20 ),
+					height: Math.min(self.options.height, $(window).innerHeight() - 20)
 				});
+				// set sizes of content
+				self._setSizes();
 			});
 
 			this._setOptions(this.options);