diff --git a/app/index.html b/app/index.html
index ab65f6c..5ca439a 100644
--- a/app/index.html
+++ b/app/index.html
@@ -64,6 +64,7 @@
     <script src="server-control/controllers/bmc-reboot-controller.js"></script>
     <script src="server-control/controllers/power-operations-controller.js"></script>
     <script src="server-control/controllers/remote-console-controller.js"></script>
+    <script src="server-control/controllers/remote-console-window-controller.js"></script>
     <script src="server-health/index.js"></script>
     <script src="server-health/controllers/diagnostics-controller.js"></script>
     <script src="server-health/controllers/inventory-controller.js"></script>
diff --git a/app/server-control/controllers/remote-console-controller.html b/app/server-control/controllers/remote-console-controller.html
index 4fbb4b1..1519073 100644
--- a/app/server-control/controllers/remote-console-controller.html
+++ b/app/server-control/controllers/remote-console-controller.html
@@ -9,10 +9,10 @@
 	</section>
 	<section class="row column">
 		<p class="serial-lan__copy">The Serial over LAN (SoL) console redirects the output of the server’s serial port to a browser window on your workstation.</p>
-		<div class="serial-lan__wrapper">
+		<div class="serial-lan__wrapper" ng-class="{'disabled': dataService.remote_window_active}">
 			<div id="terminal" class="serial-lan__terminal"></div>
 			<div class="serial-lan__actions">
-				<a href="#" class="inline btn-pop-out" target="_blank">Open in new tab</a>
+				<button class="inline btn-pop-out" ng-click="openTerminalWindow()">Open in new tab</button>
 				<a href="#" class="inline btn-export" download="{{export_name}}">Export console data</a>
 			</div>
 		</div>
diff --git a/app/server-control/controllers/remote-console-controller.js b/app/server-control/controllers/remote-console-controller.js
index dadb406..fffb139 100644
--- a/app/server-control/controllers/remote-console-controller.js
+++ b/app/server-control/controllers/remote-console-controller.js
@@ -51,6 +51,11 @@
                 
                 //Allows keyboard input
                 term.installKeyboard();
+
+                $scope.openTerminalWindow = function(){
+                    dataService.setRemoteWindowActive();
+                    $window.open('#/server-control/remote-console-window','Remote Console Window','directories=no,titlebar=no,toolbar=no,location=no,status=no,menubar=no,scrollbars=no,resizable=no,width=600,height=400');
+                }
             }
         ]
     );
diff --git a/app/server-control/controllers/remote-console-window-controller.html b/app/server-control/controllers/remote-console-window-controller.html
index 62a8ecf..e7410b7 100644
--- a/app/server-control/controllers/remote-console-window-controller.html
+++ b/app/server-control/controllers/remote-console-window-controller.html
@@ -1,5 +1,5 @@
 <div class="serial-lan__header">
-	<a class="bold"><i class="icon icon__return"></i> Return to openBmc</a>
+	<a class="bold" ng-click="close()"><i class="icon icon__return"></i> Return to openBmc</a>
 </div>
 <div class="serial-lan__wrapper">
 	<div id="terminal" class="serial-lan__terminal"></div>
diff --git a/app/server-control/index.js b/app/server-control/index.js
index 09c6795..f3ca75c 100644
--- a/app/server-control/index.js
+++ b/app/server-control/index.js
@@ -38,6 +38,11 @@
                     'controller': 'remoteConsoleController',
                     authenticated: true
                 })
+                .when('/server-control/remote-console-window', {
+                    'templateUrl': 'server-control/controllers/remote-console-window-controller.html',
+                    'controller': 'remoteConsoleWindowController',
+                    authenticated: true
+                })
                 .when('/server-control', {
                     'templateUrl': 'server-control/controllers/power-operations-controller.html',
                     'controller': 'powerOperationsController',