diff --git a/src/vs/base/browser/ui/hover/hover.css b/src/vs/base/browser/ui/hover/hover.css
index 49be4a7cbc7..42495542e3e 100644
--- a/src/vs/base/browser/ui/hover/hover.css
+++ b/src/vs/base/browser/ui/hover/hover.css
@@ -9,7 +9,7 @@
 	overflow: hidden;
 	user-select: text;
 	-webkit-user-select: text;
-	box-sizing: initial;
+	box-sizing: border-box;;
 	animation: fadein 100ms linear;
 	line-height: 1.5em;
 }
diff --git a/src/vs/editor/contrib/hover/browser/contentHover.ts b/src/vs/editor/contrib/hover/browser/contentHover.ts
index e6130ed237e..4fef502880d 100644
--- a/src/vs/editor/contrib/hover/browser/contentHover.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHover.ts
@@ -444,6 +444,7 @@ class ContentHoverVisibleData {
 
 const HORIZONTAL_SCROLLING_BY = 30;
 const SCROLLBAR_WIDTH = 10;
+const CONTAINER_HEIGHT_PADDING = 6;
 
 export class ContentHoverWidget extends ResizableContentWidget {
 
@@ -573,6 +574,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 	override _resize(size: dom.Dimension) {
 		this._setAdjustedHoverWidgetDimensions(size);
 		this._setResizableNodeMaxDimensions();
+		this._resizableNode.layout(size.height, size.width);
 		this._hover.scrollbar.scanDomNode();
 		this._editor.layoutContentWidget(this);
 	}
@@ -590,7 +592,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		if (!availableSpace) {
 			return;
 		}
-		let maximumHeight = 0;
+		let maximumHeight = CONTAINER_HEIGHT_PADDING;
 		Array.from(this._hover.contentsDomNode.children).forEach((hoverPart) => {
 			maximumHeight += hoverPart.clientHeight;
 		});