diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
index a1221137bc..4dccba2d0c 100644
--- a/core/css/jquery.ocdialog.css
+++ b/core/css/jquery.ocdialog.css
@@ -24,12 +24,11 @@
 }
 .oc-dialog-buttonrow {
 	background: white;
-	float: right;
-	position: relative;
-	bottom: 0;
+	position: absolute;
+	bottom: 15px;
+	right: 15px;
 	display: block;
 	margin-top: 10px;
-	width: 100%;
 }
 
 .oc-dialog-close {
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index 02cd6ac146..b91f3ed765 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -67,8 +67,8 @@
 				self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body');
 				var pos = self.parent.position();
 				self.$dialog.css({
-					left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2,
-					top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2
+					left: pos.left + (window.innerWidth - self.$dialog.outerWidth())/2,
+					top: pos.top + (window.innerHeight - self.$dialog.outerHeight())/2
 				});
 			});