diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.css b/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
index db3ff8001ae..812bff41e87 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
@@ -45,6 +45,11 @@
 
 .monaco-editor .parameter-hints-widget .docs {
 	padding: 0 10px 0 5px;
+	white-space: pre-wrap;
+}
+
+.monaco-editor .parameter-hints-widget .docs.markdown-docs {
+	white-space: initial;
 }
 
 .monaco-editor .parameter-hints-widget .docs .code {
diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
index bacb7f633f8..547ca4d3757 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
@@ -336,8 +336,10 @@ export class ParameterHintsWidget implements IContentWidget, IDisposable {
 		if (activeParameter && activeParameter.documentation) {
 			const documentation = $('span.documentation');
 			if (typeof activeParameter.documentation === 'string') {
+				dom.removeClass(this.docs, 'markdown-docs');
 				documentation.textContent = activeParameter.documentation;
 			} else {
+				dom.addClass(this.docs, 'markdown-docs');
 				documentation.appendChild(this.markdownRenderer.render(activeParameter.documentation));
 			}
 			dom.append(this.docs, $('p', null, documentation));
diff --git a/src/vs/editor/contrib/suggest/browser/media/suggest.css b/src/vs/editor/contrib/suggest/browser/media/suggest.css
index 3eee4201f43..1890d7da019 100644
--- a/src/vs/editor/contrib/suggest/browser/media/suggest.css
+++ b/src/vs/editor/contrib/suggest/browser/media/suggest.css
@@ -228,6 +228,11 @@
 .monaco-editor .suggest-widget .details > .monaco-scrollable-element > .body > .docs {
 	margin: 0;
 	padding: 4px 5px;
+	white-space: pre-wrap;
+}
+
+.monaco-editor .suggest-widget .details > .monaco-scrollable-element > .body > .docs.marked-docs {
+	white-space: initial;
 }
 
 .monaco-editor .suggest-widget .details > .monaco-scrollable-element > .body > .docs .code {
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
index 63a2a0e9e3a..c81691c39b6 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -249,8 +249,10 @@ class SuggestionDetails {
 		}
 		removeClass(this.el, 'no-docs');
 		if (typeof item.suggestion.documentation === 'string') {
+			removeClass(this.docs, 'marked-docs');
 			this.docs.textContent = item.suggestion.documentation;
 		} else {
+			addClass(this.docs, 'marked-docs');
 			this.docs.innerHTML = this.markdownRenderer.render(item.suggestion.documentation).innerHTML;
 		}