diff --git a/.gitignore b/.gitignore
index 4bcd5bd4..2cce2e55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -263,5 +263,6 @@ __pycache__/
 /Remotely_Server/wwwroot/Downloads/*.exe
 /Remotely_Server/wwwroot/Downloads/*.zip
 /Remotely_Server/wwwroot/Downloads/*.appimage
+/Remotely_Server/wwwroot/Downloads/CurrentAgentVersion.txt
 /Remotely_Server/Server.db
 /Remotely_Agent/Resources/*
\ No newline at end of file
diff --git a/Remotely_Desktop/ViewModels/MainWindowViewModel.cs b/Remotely_Desktop/ViewModels/MainWindowViewModel.cs
index 18363175..31d7caa3 100644
--- a/Remotely_Desktop/ViewModels/MainWindowViewModel.cs
+++ b/Remotely_Desktop/ViewModels/MainWindowViewModel.cs
@@ -54,6 +54,7 @@ namespace Remotely_Desktop.ViewModels
             Config = Config.GetConfig();
             while (string.IsNullOrWhiteSpace(Config.Host))
             {
+                Config.Host = "https://";
                 PromptForHostName();
             }
 
@@ -135,6 +136,10 @@ namespace Remotely_Desktop.ViewModels
             prompt.Owner = App.Current?.MainWindow;
             prompt.ShowDialog();
             var result = HostNamePromptViewModel.Current.Host.TrimEnd("/".ToCharArray());
+            if (!result.StartsWith("https://") && !result.StartsWith("http://"))
+            {
+                result = $"https://{result}";
+            }
             if (result != Config.Host)
             {
                 Config.Host = result;
diff --git a/Remotely_Server/Pages/_IndexLoggedIn.cshtml b/Remotely_Server/Pages/_IndexLoggedIn.cshtml
index a28362b8..51a1617a 100644
--- a/Remotely_Server/Pages/_IndexLoggedIn.cshtml
+++ b/Remotely_Server/Pages/_IndexLoggedIn.cshtml
@@ -2,8 +2,19 @@
 
 <div class="work-area hidden">
     <ul class="nav nav-tabs">
-        <li class="nav-item"><a class="nav-link active show" href="#consoleFrame" data-toggle="tab">Console</a></li>
-        <li class="nav-item"><a class="nav-link" href="#dataGridFrame" data-toggle="tab">Grid</a></li>
+        <li class="nav-item">
+            <a id="consoleTab" class="nav-link active show" href="#consoleFrame" data-toggle="tab">
+                Console
+                <span id="consoleAlert" class="badge badge-info badge-pill align-top" hidden>
+                    <i class="fa fa-exclamation" aria-hidden="true"></i>
+                </span>
+             </a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="#dataGridFrame" data-toggle="tab">
+                Grid
+            </a>
+        </li>
     </ul>
     <div id="tabContentWrapper">
         <div class="tab-content">
diff --git a/Remotely_Server/web.config b/Remotely_Server/web.config
index aebef98b..8e99b1bd 100644
--- a/Remotely_Server/web.config
+++ b/Remotely_Server/web.config
@@ -4,6 +4,11 @@
     <modules runAllManagedModulesForAllRequests="false">
       <remove name="WebDAVModule" />
     </modules>
+    <security>
+      <requestFiltering>
+        <requestLimits maxAllowedContentLength="100000000" />
+      </requestFiltering>
+    </security>
   </system.webServer>
   <!-- To customize the asp.net core module uncomment and edit the following section. 
   For more info see https://go.microsoft.com/fwlink/?linkid=838655 -->
diff --git a/Remotely_Server/wwwroot/css/site.css b/Remotely_Server/wwwroot/css/site.css
index adccbf1a..b1d72668 100644
--- a/Remotely_Server/wwwroot/css/site.css
+++ b/Remotely_Server/wwwroot/css/site.css
@@ -37,6 +37,23 @@ a.navbar-brand {
     overflow-y: hidden;
     margin-top: 10px
 }
+#consoleAlert {
+    animation-name: blink;
+    animation-direction: alternate-reverse;
+    animation-duration: 1s;
+    animation-iteration-count: infinite;
+    animation-timing-function: ease;
+}
+@keyframes blink {
+    from {
+        opacity: .25;
+    }
+
+    to {
+        opacity: 1;
+    }
+}
+
 
 #dataGridFrame {
     max-height: calc(100vh - 250px);
diff --git a/Remotely_Server/wwwroot/scripts/CommandCompletion.js b/Remotely_Server/wwwroot/scripts/CommandCompletion.js
index 8c8368f3..fcf00a84 100644
--- a/Remotely_Server/wwwroot/scripts/CommandCompletion.js
+++ b/Remotely_Server/wwwroot/scripts/CommandCompletion.js
@@ -1,6 +1,11 @@
 import { UserSettings } from "./UserSettings.js";
 import { Store } from "./Store.js";
+import { WebCommands } from "./Commands/WebCommands.js";
 import * as UI from "./UI.js";
+import { CMDCommands } from "./Commands/CMDCommands.js";
+import { PSCoreCommands } from "./Commands/PSCoreCommands.js";
+import { WinPSCommands } from "./Commands/WinPSCommands.js";
+import { BashCommands } from "./Commands/BashCommands.js";
 var commandCompletionDisplayTimeout;
 export function DisplayCommandCompletions(commands, relevantText) {
     window.clearTimeout(commandCompletionDisplayTimeout);
@@ -9,14 +14,14 @@ export function DisplayCommandCompletions(commands, relevantText) {
             var commandCompletionItem = document.createElement("div");
             commandCompletionItem.classList.add("command-completion-item");
             commandCompletionItem.innerHTML = x.Name;
-            commandCompletionItem.onclick = function (e) {
+            commandCompletionItem.onclick = function () {
                 var commandText = UI.ConsoleTextArea.value;
                 var insertCommandStart = commandText.lastIndexOf(relevantText);
                 UI.ConsoleTextArea.value = commandText.substring(0, insertCommandStart) + commandCompletionItem.innerHTML;
                 UI.CommandCompletionDiv.classList.add("hidden");
                 UI.CommandInfoDiv.classList.add("hidden");
             };
-            commandCompletionItem.onfocus = function (e) {
+            commandCompletionItem.onfocus = function () {
                 ShowCommandInfo(x);
             };
             UI.CommandCompletionDiv.appendChild(commandCompletionItem);
@@ -46,13 +51,13 @@ export function DisplayParameterCompletions(command, parameters, commandText) {
         var commandCompletionItem = document.createElement("div");
         commandCompletionItem.classList.add("command-completion-item");
         commandCompletionItem.innerHTML = param.Name;
-        commandCompletionItem.onclick = function (e) {
+        commandCompletionItem.onclick = function () {
             var preParam = UI.ConsoleTextArea.value.substring(0, UI.ConsoleTextArea.value.lastIndexOf(" "));
             UI.ConsoleTextArea.value = preParam.trim() + ` -${commandCompletionItem.innerText}`;
             UI.CommandCompletionDiv.classList.add("hidden");
             UI.CommandInfoDiv.classList.add("hidden");
         };
-        commandCompletionItem.onfocus = function (e) {
+        commandCompletionItem.onfocus = function () {
             ShowParameterInfo(param);
         };
         UI.CommandCompletionDiv.appendChild(commandCompletionItem);
@@ -71,13 +76,13 @@ export function DisplayCommandShortcuts(shortcutText) {
         var commandCompletionItem = document.createElement("div");
         commandCompletionItem.classList.add("command-completion-item");
         commandCompletionItem.innerHTML = x;
-        commandCompletionItem.onclick = function (e) {
+        commandCompletionItem.onclick = function () {
             UI.CommandModeSelect.value = x;
             UI.ConsoleTextArea.value = "";
             UI.CommandCompletionDiv.classList.add("hidden");
             UI.CommandInfoDiv.classList.add("hidden");
         };
-        commandCompletionItem.onfocus = function (e) { };
+        commandCompletionItem.onfocus = function () { };
         UI.CommandCompletionDiv.appendChild(commandCompletionItem);
     });
     if (!UI.CommandCompletionDiv.classList.contains("hidden") && matchingShortcuts.length > 0) {
@@ -85,6 +90,32 @@ export function DisplayCommandShortcuts(shortcutText) {
         PositionCommandCompletionWindow();
     }
 }
+export function GetCommandCompletions(commandText) {
+    var commandList;
+    switch (UI.CommandModeSelect.value) {
+        case "Web":
+            commandList = WebCommands;
+            break;
+        case "CMD":
+            commandList = CMDCommands;
+            break;
+        case "PSCore":
+            commandList = PSCoreCommands;
+            break;
+        case "WinPS":
+            commandList = WinPSCommands;
+            break;
+        case "Bash":
+            commandList = BashCommands;
+            break;
+        default:
+            UI.CommandCompletionDiv.classList.add("hidden");
+            return;
+    }
+    var filteredList = commandList.filter(x => x.Name.toLowerCase().indexOf(commandText.toLowerCase()) > -1);
+    filteredList.sort((a, b) => a.Name.localeCompare(b.Name));
+    return filteredList;
+}
 export function SetCommandCompletionPositionToIncompleteParam(parameters) {
     var lastParam = parameters[parameters.length - 1];
     if (typeof lastParam != 'undefined' && lastParam.Value.length == 0) {
diff --git a/Remotely_Server/wwwroot/scripts/CommandCompletion.js.map b/Remotely_Server/wwwroot/scripts/CommandCompletion.js.map
index dd076074..130a99a7 100644
--- a/Remotely_Server/wwwroot/scripts/CommandCompletion.js.map
+++ b/Remotely_Server/wwwroot/scripts/CommandCompletion.js.map
@@ -1 +1 @@
-{"version":3,"file":"CommandCompletion.js","sourceRoot":"","sources":["CommandCompletion.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"CommandCompletion.js","sourceRoot":"","sources":["CommandCompletion.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/CommandCompletion.ts b/Remotely_Server/wwwroot/scripts/CommandCompletion.ts
index 8432b28a..5b1182ce 100644
--- a/Remotely_Server/wwwroot/scripts/CommandCompletion.ts
+++ b/Remotely_Server/wwwroot/scripts/CommandCompletion.ts
@@ -1,13 +1,14 @@
-import * as CommandProcessor from "./CommandProcessor.js";
-import { UserSettings } from "./UserSettings.js";
-import * as Utilities from "./Utilities.js";
+import { UserSettings } from "./UserSettings.js";
 import { Store } from "./Store.js";
 import { ConsoleCommand } from "./Models/ConsoleCommand.js";
 import { CommandLineParameter } from "./Models/CommandLineParameter.js";
 import { WebCommands } from "./Commands/WebCommands.js";
 import { Parameter } from "./Models/Parameter.js";
-import { Main } from "./Main.js";
 import * as UI from "./UI.js"
+import { CMDCommands } from "./Commands/CMDCommands.js";
+import { PSCoreCommands } from "./Commands/PSCoreCommands.js";
+import { WinPSCommands } from "./Commands/WinPSCommands.js";
+import { BashCommands } from "./Commands/BashCommands.js";
 
 var commandCompletionDisplayTimeout;
 
@@ -18,14 +19,14 @@ export function DisplayCommandCompletions(commands: Array<ConsoleCommand>, relev
             var commandCompletionItem = document.createElement("div");
             commandCompletionItem.classList.add("command-completion-item");
             commandCompletionItem.innerHTML = x.Name;
-            commandCompletionItem.onclick = function (e) {
+            commandCompletionItem.onclick = function () {
                 var commandText = UI.ConsoleTextArea.value;
                 var insertCommandStart = commandText.lastIndexOf(relevantText);
                 UI.ConsoleTextArea.value = commandText.substring(0, insertCommandStart) + commandCompletionItem.innerHTML;
                 UI.CommandCompletionDiv.classList.add("hidden");
                 UI.CommandInfoDiv.classList.add("hidden");
             };
-            commandCompletionItem.onfocus = function (e) {
+            commandCompletionItem.onfocus = function () {
                 ShowCommandInfo(x);
             }
             UI.CommandCompletionDiv.appendChild(commandCompletionItem);
@@ -60,13 +61,13 @@ export function DisplayParameterCompletions(command: ConsoleCommand, parameters:
         var commandCompletionItem = document.createElement("div");
         commandCompletionItem.classList.add("command-completion-item");
         commandCompletionItem.innerHTML = param.Name;
-        commandCompletionItem.onclick = function (e: MouseEvent) {
+        commandCompletionItem.onclick = function () {
             var preParam = UI.ConsoleTextArea.value.substring(0, UI.ConsoleTextArea.value.lastIndexOf(" "));
             UI.ConsoleTextArea.value = preParam.trim() + ` -${commandCompletionItem.innerText}`;
             UI.CommandCompletionDiv.classList.add("hidden");
             UI.CommandInfoDiv.classList.add("hidden");
         };
-        commandCompletionItem.onfocus = function (e) {
+        commandCompletionItem.onfocus = function () {
             ShowParameterInfo(param);
         }
         UI.CommandCompletionDiv.appendChild(commandCompletionItem);
@@ -86,13 +87,13 @@ export function DisplayCommandShortcuts(shortcutText: string) {
         var commandCompletionItem = document.createElement("div");
         commandCompletionItem.classList.add("command-completion-item");
         commandCompletionItem.innerHTML = x;
-        commandCompletionItem.onclick = function (e: MouseEvent) {
+        commandCompletionItem.onclick = function () {
             UI.CommandModeSelect.value = x;
             UI.ConsoleTextArea.value = "";
             UI.CommandCompletionDiv.classList.add("hidden");
             UI.CommandInfoDiv.classList.add("hidden");
         };
-        commandCompletionItem.onfocus = function (e) {}
+        commandCompletionItem.onfocus = function () {}
         UI.CommandCompletionDiv.appendChild(commandCompletionItem);
     })
     if (!UI.CommandCompletionDiv.classList.contains("hidden") && matchingShortcuts.length > 0) {
@@ -101,6 +102,34 @@ export function DisplayCommandShortcuts(shortcutText: string) {
     }
 }
 
+export function GetCommandCompletions(commandText: string): ConsoleCommand[] {
+    var commandList:ConsoleCommand[];
+    switch (UI.CommandModeSelect.value) {
+        case "Web":
+            commandList = WebCommands;
+            break;
+        case "CMD":
+            commandList = CMDCommands;
+            break;
+        case "PSCore":
+            commandList = PSCoreCommands;
+            break;
+        case "WinPS":
+            commandList = WinPSCommands;
+            break;
+        case "Bash":
+            commandList = BashCommands;
+            break;
+        default:
+            UI.CommandCompletionDiv.classList.add("hidden");
+            return;
+    }
+
+    var filteredList = commandList.filter(x => x.Name.toLowerCase().indexOf(commandText.toLowerCase()) > -1);
+    filteredList.sort((a, b) => a.Name.localeCompare(b.Name));
+    return filteredList;
+}
+
 export function SetCommandCompletionPositionToIncompleteParam(parameters: CommandLineParameter[]) {
     var lastParam = parameters[parameters.length - 1];
     if (typeof lastParam != 'undefined' && lastParam.Value.length == 0) {
diff --git a/Remotely_Server/wwwroot/scripts/CommandProcessor.js b/Remotely_Server/wwwroot/scripts/CommandProcessor.js
index df8fc6b7..fb537ef7 100644
--- a/Remotely_Server/wwwroot/scripts/CommandProcessor.js
+++ b/Remotely_Server/wwwroot/scripts/CommandProcessor.js
@@ -1,14 +1,10 @@
 import { WebCommands } from "./Commands/WebCommands.js";
 import { UserSettings } from "./UserSettings.js";
-import { CMDCommands } from "./Commands/CMDCommands.js";
-import { PSCoreCommands } from "./Commands/PSCoreCommands.js";
-import { BashCommands } from "./Commands/BashCommands.js";
 import { Main } from "./Main.js";
 import { CommandLineParameter } from "./Models/CommandLineParameter.js";
 import * as UI from "./UI.js";
 import { Store } from "./Store.js";
-import { DisplayCommandShortcuts, DisplayCommandCompletions, DisplayParameterCompletions } from "./CommandCompletion.js";
-import { WinPSCommands } from "./Commands/WinPSCommands.js";
+import { DisplayCommandShortcuts, DisplayCommandCompletions, DisplayParameterCompletions, GetCommandCompletions } from "./CommandCompletion.js";
 import { Connection } from "./BrowserSockets.js";
 export function EvaluateCurrentCommandText() {
     UI.AutoSizeTextArea();
@@ -60,30 +56,6 @@ export function GetRelevantCommandText(commandText) {
     }
     return commandText;
 }
-export function GetCommandCompletions(commandText) {
-    var commandList;
-    switch (UI.CommandModeSelect.value) {
-        case "Web":
-            commandList = WebCommands;
-            break;
-        case "CMD":
-            commandList = CMDCommands;
-            break;
-        case "PSCore":
-            commandList = PSCoreCommands;
-            break;
-        case "WinPS":
-            commandList = WinPSCommands;
-            break;
-        case "Bash":
-            commandList = BashCommands;
-            break;
-        default:
-            UI.CommandCompletionDiv.classList.add("hidden");
-            return;
-    }
-    return commandList.filter(x => x.Name.toLowerCase().indexOf(commandText.toLowerCase()) > -1);
-}
 /** Checks the given string for a matching shortcut. */
 export function GetCommandModeShortcut() {
     switch (UI.ConsoleTextArea.value.toLowerCase()) {
diff --git a/Remotely_Server/wwwroot/scripts/CommandProcessor.js.map b/Remotely_Server/wwwroot/scripts/CommandProcessor.js.map
index 4621ae60..d2d11807 100644
--- a/Remotely_Server/wwwroot/scripts/CommandProcessor.js.map
+++ b/Remotely_Server/wwwroot/scripts/CommandProcessor.js.map
@@ -1 +1 @@
-{"version":3,"file":"CommandProcessor.js","sourceRoot":"","sources":["CommandProcessor.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"CommandProcessor.js","sourceRoot":"","sources":["CommandProcessor.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/CommandProcessor.ts b/Remotely_Server/wwwroot/scripts/CommandProcessor.ts
index 090bb087..9869c721 100644
--- a/Remotely_Server/wwwroot/scripts/CommandProcessor.ts
+++ b/Remotely_Server/wwwroot/scripts/CommandProcessor.ts
@@ -1,15 +1,10 @@
 import { WebCommands } from "./Commands/WebCommands.js";
 import { UserSettings } from "./UserSettings.js";
-import { CMDCommands } from "./Commands/CMDCommands.js";
-import { PSCoreCommands } from "./Commands/PSCoreCommands.js";
-import { BashCommands } from "./Commands/BashCommands.js";
 import { Main } from "./Main.js";
 import { CommandLineParameter } from "./Models/CommandLineParameter.js";
 import * as UI from "./UI.js";
 import { Store } from "./Store.js";
-import { ConsoleCommand } from "./Models/ConsoleCommand.js";
-import { DisplayCommandShortcuts, DisplayCommandCompletions, DisplayParameterCompletions } from "./CommandCompletion.js";
-import { WinPSCommands } from "./Commands/WinPSCommands.js";
+import { DisplayCommandShortcuts, DisplayCommandCompletions, DisplayParameterCompletions, GetCommandCompletions } from "./CommandCompletion.js";
 import { Connection } from "./BrowserSockets.js";
 
 export function EvaluateCurrentCommandText() {
@@ -63,31 +58,7 @@ export function GetRelevantCommandText(commandText:string) {
     }
     return commandText;
 }
-export function GetCommandCompletions(commandText:string): ConsoleCommand[] {
-    var commandList;
-    switch (UI.CommandModeSelect.value) {
-        case "Web":
-            commandList = WebCommands;
-            break;
-        case "CMD":
-            commandList = CMDCommands;
-            break;
-        case "PSCore":
-            commandList = PSCoreCommands;
-            break;
-        case "WinPS":
-            commandList = WinPSCommands;
-            break;
-        case "Bash":
-            commandList = BashCommands;
-            break;
-        default:
-            UI.CommandCompletionDiv.classList.add("hidden");
-            return;
-    }
 
-    return commandList.filter(x => x.Name.toLowerCase().indexOf(commandText.toLowerCase()) > -1);
-}
 
 /** Checks the given string for a matching shortcut. */
 export function GetCommandModeShortcut() {
diff --git a/Remotely_Server/wwwroot/scripts/InputEventHandlers.js b/Remotely_Server/wwwroot/scripts/InputEventHandlers.js
index f5458af9..e244246b 100644
--- a/Remotely_Server/wwwroot/scripts/InputEventHandlers.js
+++ b/Remotely_Server/wwwroot/scripts/InputEventHandlers.js
@@ -12,6 +12,7 @@ export function ApplyInputEventHandlers() {
     inputOnFilterTextBox();
     clickToggleAllDevices();
     clickStartRemoteControlButton();
+    consoleTabSelected();
     window.addEventListener("resize", ev => {
         PositionCommandCompletionWindow();
     });
@@ -149,6 +150,11 @@ function inputOnFilterTextBox() {
         });
     });
 }
+function consoleTabSelected() {
+    $(UI.ConsoleTab).on("shown.bs.tab", () => {
+        UI.ConsoleAlert.hidden = true;
+    });
+}
 function clickToggleAllDevices() {
     document.getElementById("toggleAllDevices").addEventListener("click", function (e) {
         DataGrid.ToggleSelectAll();
diff --git a/Remotely_Server/wwwroot/scripts/InputEventHandlers.js.map b/Remotely_Server/wwwroot/scripts/InputEventHandlers.js.map
index 15bba69c..ca27c40a 100644
--- a/Remotely_Server/wwwroot/scripts/InputEventHandlers.js.map
+++ b/Remotely_Server/wwwroot/scripts/InputEventHandlers.js.map
@@ -1 +1 @@
-{"version":3,"file":"InputEventHandlers.js","sourceRoot":"","sources":["InputEventHandlers.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"InputEventHandlers.js","sourceRoot":"","sources":["InputEventHandlers.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/InputEventHandlers.ts b/Remotely_Server/wwwroot/scripts/InputEventHandlers.ts
index ad3206b4..840989ff 100644
--- a/Remotely_Server/wwwroot/scripts/InputEventHandlers.ts
+++ b/Remotely_Server/wwwroot/scripts/InputEventHandlers.ts
@@ -14,6 +14,7 @@ export function ApplyInputEventHandlers() {
     inputOnFilterTextBox();
     clickToggleAllDevices();
     clickStartRemoteControlButton();
+    consoleTabSelected();
 
     window.addEventListener("resize", ev => {
         PositionCommandCompletionWindow();
@@ -156,6 +157,11 @@ function inputOnFilterTextBox() {
         })
     })
 }
+function consoleTabSelected() {
+    $(UI.ConsoleTab).on("shown.bs.tab", () => {
+        UI.ConsoleAlert.hidden = true;
+    });
+}
 function clickToggleAllDevices() {
     document.getElementById("toggleAllDevices").addEventListener("click", function (e) {
         DataGrid.ToggleSelectAll();
diff --git a/Remotely_Server/wwwroot/scripts/UI.js b/Remotely_Server/wwwroot/scripts/UI.js
index fbf638f5..62a245a7 100644
--- a/Remotely_Server/wwwroot/scripts/UI.js
+++ b/Remotely_Server/wwwroot/scripts/UI.js
@@ -13,6 +13,8 @@ export var TotalDevicesCount = document.querySelector("#totalDevicesSpan");
 export var MeasurementCanvas = document.createElement("canvas");
 export var MeasurementContext = MeasurementCanvas.getContext("2d");
 export var TabContentWrapper = document.getElementById("tabContentWrapper");
+export var ConsoleTab = document.getElementById("consoleTab");
+export var ConsoleAlert = document.getElementById("consoleAlert");
 export function AddConsoleOutput(strOutputMessage) {
     var outputBlock = document.createElement("div");
     outputBlock.classList.add("console-block");
@@ -26,6 +28,9 @@ export function AddConsoleOutput(strOutputMessage) {
     outputBlock.appendChild(output);
     ConsoleOutputDiv.appendChild(outputBlock);
     TabContentWrapper.scrollTop = TabContentWrapper.scrollHeight;
+    if (!ConsoleTab.classList.contains("active")) {
+        ConsoleAlert.hidden = false;
+    }
 }
 export function AddConsoleHTML(html) {
     var contentWrapper = document.createElement("div");
diff --git a/Remotely_Server/wwwroot/scripts/UI.js.map b/Remotely_Server/wwwroot/scripts/UI.js.map
index 82f69de0..88046d5b 100644
--- a/Remotely_Server/wwwroot/scripts/UI.js.map
+++ b/Remotely_Server/wwwroot/scripts/UI.js.map
@@ -1 +1 @@
-{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/UI.ts b/Remotely_Server/wwwroot/scripts/UI.ts
index 78965fc5..65a76e97 100644
--- a/Remotely_Server/wwwroot/scripts/UI.ts
+++ b/Remotely_Server/wwwroot/scripts/UI.ts
@@ -27,6 +27,8 @@ export var TotalDevicesCount = document.querySelector("#totalDevicesSpan") as HT
 export var MeasurementCanvas = document.createElement("canvas");
 export var MeasurementContext = MeasurementCanvas.getContext("2d");
 export var TabContentWrapper = document.getElementById("tabContentWrapper") as HTMLDivElement;
+export var ConsoleTab = document.getElementById("consoleTab") as HTMLAnchorElement;
+export var ConsoleAlert = document.getElementById("consoleAlert") as HTMLAnchorElement;
 
 
 export function AddConsoleOutput(strOutputMessage:string) {
@@ -47,6 +49,10 @@ export function AddConsoleOutput(strOutputMessage:string) {
     ConsoleOutputDiv.appendChild(outputBlock);
 
     TabContentWrapper.scrollTop = TabContentWrapper.scrollHeight;
+
+    if (!ConsoleTab.classList.contains("active")) {
+        ConsoleAlert.hidden = false;
+    }
 }
 export function AddConsoleHTML(html: string) {
     var contentWrapper = document.createElement("div");