diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css
index b39508ffe25..2fa59769fa7 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css
+++ b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css
@@ -40,6 +40,8 @@
 .monaco-workbench .panel.integrated-terminal .xterm-viewport {
 	/* Subtract right margin so that the scroll bar aligns with size of panel */
 	margin-right: -20px;
+	/* Force 100% height so that the scroll bar is aligned to the top and the bottom of the panel, the terminal rows may not be top aligned */
+	height: 100% !important;
 }
 
 /* Terminal actions */