diff --git a/demos/tooltip/custom-content.html b/demos/tooltip/custom-content.html
index 93172524a..20039e2b8 100644
--- a/demos/tooltip/custom-content.html
+++ b/demos/tooltip/custom-content.html
@@ -22,6 +22,9 @@
 		width: 350px;
 		height: 350px;
 	}
+	.ui-tooltip {
+		max-width: 350px;
+	}
 	</style>
 	<script>
 	$(function() {
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 482ce2120..34c9b1a1a 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -54,7 +54,7 @@ $.widget( "ui.tooltip", {
 		position: {
 			my: "left top+15",
 			at: "left bottom",
-			collision: "flipfit flipfit"
+			collision: "flipfit flip"
 		},
 		show: true,
 		tooltipClass: null,