diff --git a/www/Makefile b/www/Makefile
index affeb6a9..dc23e602 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -37,6 +37,7 @@ JSSRC=							\
 	dashboard/RunningTasks.js			\
 	dashboard/TaskSummary.js			\
 	panel/Tasks.js					\
+	panel/XtermJsConsole.js				\
 	Utils.js					\
 	AccessControlPanel.js				\
 	ZFSList.js					\
diff --git a/www/NavigationTree.js b/www/NavigationTree.js
index f0f48c0a..09c58938 100644
--- a/www/NavigationTree.js
+++ b/www/NavigationTree.js
@@ -55,6 +55,12 @@ Ext.define('PBS.store.NavigationStore', {
 		expanded: true,
 		leaf: false,
 		children: [
+		    {
+			text: gettext('Shell'),
+			iconCls: 'fa fa-terminal',
+			path: 'pbsXtermJsConsole',
+			leaf: true,
+		    },
 		    {
 			text: gettext('Disks'),
 			iconCls: 'fa fa-hdd-o',
diff --git a/www/panel/XtermJsConsole.js b/www/panel/XtermJsConsole.js
new file mode 100644
index 00000000..dd83251f
--- /dev/null
+++ b/www/panel/XtermJsConsole.js
@@ -0,0 +1,25 @@
+Ext.define('PBS.panel.XtermJsConsole', {
+    extend: 'Ext.panel.Panel',
+    alias: 'widget.pbsXtermJsConsole',
+
+    layout: 'fit',
+
+    items: [
+	{
+	    xtype: 'uxiframe',
+	    itemId: 'iframe',
+	},
+    ],
+
+    listeners: {
+	'afterrender': function() {
+	    let me = this;
+	    let params = {
+		console: 'shell',
+		node: 'localhost',
+		xtermjs: 1,
+	    };
+	    me.getComponent('iframe').load('/?' + Ext.Object.toQueryString(params));
+	},
+    },
+});