diff --git a/app/kubernetes/components/kubectl-shell/kubectl-shell.controller.js b/app/kubernetes/components/kubectl-shell/kubectl-shell.controller.js
index 15e31baef..6fa2a5f58 100644
--- a/app/kubernetes/components/kubectl-shell/kubectl-shell.controller.js
+++ b/app/kubernetes/components/kubectl-shell/kubectl-shell.controller.js
@@ -39,6 +39,7 @@ export default class KubectlShellController {
   }
 
   configureSocketAndTerminal(socket, term) {
+    var vm = this;
     socket.onopen = function () {
       const terminal_container = document.getElementById('terminal-container');
       term.open(terminal_container);
@@ -55,7 +56,7 @@ export default class KubectlShellController {
     });
 
     this.$window.onresize = function () {
-      term.fit();
+      vm.TerminalWindow.terminalresize();
     };
 
     socket.onmessage = function (msg) {
diff --git a/app/kubernetes/components/kubectl-shell/kubectl-shell.css b/app/kubernetes/components/kubectl-shell/kubectl-shell.css
index 969252f19..829baf691 100644
--- a/app/kubernetes/components/kubectl-shell/kubectl-shell.css
+++ b/app/kubernetes/components/kubectl-shell/kubectl-shell.css
@@ -60,7 +60,7 @@ ul.sidebar li .shell-item-center a:hover {
   bottom: 0;
   left: 0;
   width: 100vw;
-  height: 480px;
+  height: 495px;
   z-index: 1000;
 }
 
diff --git a/app/portainer/services/terminal-window.js b/app/portainer/services/terminal-window.js
index 0464fa1d8..5bd10dbf7 100644
--- a/app/portainer/services/terminal-window.js
+++ b/app/portainer/services/terminal-window.js
@@ -1,6 +1,6 @@
 angular.module('portainer').service('TerminalWindow', function ($window) {
+  const terminalHeight = 495;
   this.terminalopen = function () {
-    const terminalHeight = 480;
     const contentWrapperHeight = $window.innerHeight;
     const newContentWrapperHeight = contentWrapperHeight - terminalHeight;
     document.getElementById('content-wrapper').style.height = newContentWrapperHeight + 'px';
@@ -16,4 +16,11 @@ angular.module('portainer').service('TerminalWindow', function ($window) {
     document.getElementById('content-wrapper').style.overflowY = wrapperCSS.overflowY;
     document.getElementById('sidebar-wrapper').style.height = wrapperCSS.height;
   };
+  this.terminalresize = function () {
+    const contentWrapperHeight = $window.innerHeight;
+    const newContentWrapperHeight = contentWrapperHeight - terminalHeight;
+    document.getElementById('content-wrapper').style.height = newContentWrapperHeight + 'px';
+    document.getElementById('content-wrapper').style.overflowY = 'auto';
+    document.getElementById('sidebar-wrapper').style.height = newContentWrapperHeight + 'px';
+  };
 });