diff --git a/public/themes/default.css b/public/themes/default.css
index d81350f8a..84789e919 100644
--- a/public/themes/default.css
+++ b/public/themes/default.css
@@ -220,6 +220,4 @@
     --modal-header-bottom-border-color: rgba(241, 246, 243, 0.15);
 
     --logo-button-hover-bg-color: #1e1e1e;
-
-    --xterm-viewport-border-color: rgba(241, 246, 243, 0.15);
 }
diff --git a/public/themes/light.css b/public/themes/light.css
index 78f72a45d..d6b22832a 100644
--- a/public/themes/light.css
+++ b/public/themes/light.css
@@ -74,6 +74,4 @@
     --toggle-thumb-color: var(--app-bg-color);
 
     --logo-button-hover-bg-color: #f0f0f0;
-
-    --xterm-viewport-border-color: rgba(0, 0, 0, 0.3);
 }
diff --git a/public/themes/term-default.css b/public/themes/term-default.css
index 0037124b2..2a868253c 100644
--- a/public/themes/term-default.css
+++ b/public/themes/term-default.css
@@ -3,7 +3,7 @@
 
 :root {
     /* 
-     * term colors (16 + 2) form the base terminal theme 
+     * term colors (16 + 5) form the base terminal theme 
      * for consistency these colors should be used by plugins/applications
      */
     --term-black: #000000;
@@ -27,4 +27,5 @@
     --term-cmdtext: #ffffff;
     --term-foreground: #d3d7cf;
     --term-background: #000000;
+    --term-selection-background: #ffffff40;
 }
diff --git a/public/themes/term-light.css b/public/themes/term-light.css
index 2cffb2ee5..479a6a346 100644
--- a/public/themes/term-light.css
+++ b/public/themes/term-light.css
@@ -6,4 +6,5 @@
     --term-foreground: #000000;
     --term-background: #fefefe;
     --term-cmdtext: #000000;
+    --term-selection-background: #00000018;
 }
diff --git a/src/app/common/modals/viewremoteconndetail.less b/src/app/common/modals/viewremoteconndetail.less
index 44d474178..23ccd10ae 100644
--- a/src/app/common/modals/viewremoteconndetail.less
+++ b/src/app/common/modals/viewremoteconndetail.less
@@ -90,25 +90,12 @@
                     margin-top: 5px;
                     overflow-x: auto;
                     overflow-y: hidden;
+                    border: 1px solid var(--app-border-color);
+                    border-radius: 6px;
+                    padding: 6px 10px;
 
                     .terminal-connectelem {
                         height: 163px !important; // Needed to override plugin height
-
-                        .xterm-viewport {
-                            display: flex;
-                            padding: 6px 10px;
-                            gap: 8px;
-                            align-items: flex-start;
-                            align-self: stretch;
-                            border-radius: 6px;
-                            border: 1px solid var(--xterm-viewport-border-color);
-                            background: #080a08;
-                            height: 163px !important; // Needed to override plugin height
-                        }
-
-                        .xterm-screen {
-                            padding: 10px;
-                        }
                     }
                 }
             }
diff --git a/src/plugins/terminal/term.ts b/src/plugins/terminal/term.ts
index 38440f968..e20011521 100644
--- a/src/plugins/terminal/term.ts
+++ b/src/plugins/terminal/term.ts
@@ -57,6 +57,7 @@ function getThemeFromCSSVars(): ITheme {
     theme.brightMagenta = rootStyle.getPropertyValue("--term-bright-magenta");
     theme.brightCyan = rootStyle.getPropertyValue("--term-bright-cyan");
     theme.brightWhite = rootStyle.getPropertyValue("--term-bright-white");
+    theme.selectionBackground = rootStyle.getPropertyValue("--term-selection-background");
     return theme;
 }