diff --git a/themes/base/jquery.ui.tooltip.css b/themes/base/jquery.ui.tooltip.css
index e293eeb23e..acc39a0021 100644
--- a/themes/base/jquery.ui.tooltip.css
+++ b/themes/base/jquery.ui.tooltip.css
@@ -10,6 +10,7 @@
 	padding:8px;
 	position:absolute;
 	z-index:9999;
+	max-width: 300px;
 	-o-box-shadow: 0 0 5px #aaa;
 	-moz-box-shadow: 0 0 5px #aaa;
 	-webkit-box-shadow: 0 0 5px #aaa;
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index a04b842893..4a17f1f20f 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -52,8 +52,8 @@ $.widget( "ui.tooltip", {
 		// Disabled elements have inconsistent behavior across browsers (#8661)
 		items: "[title]:not([disabled])",
 		position: {
-			my: "left+15 center",
-			at: "right center",
+			my: "left top+15",
+			at: "left bottom",
 			collision: "flipfit flipfit"
 		},
 		show: true,