diff --git a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel-controller.js b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel-controller.js
new file mode 100644
index 000000000..0d2eda943
--- /dev/null
+++ b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel-controller.js
@@ -0,0 +1,19 @@
+angular
+  .module('portainer.docker')
+  .controller('SwarmNodeDetailsPanelController', [
+    function SwarmNodeDetailsPanelController() {
+      this.$onInit = initView;
+      this.state = {
+        managerAddress: ''
+      };
+
+      var managerRole = 'manager';
+
+      function initView() {
+        if (this.details.role === managerRole) {
+          this.state.managerAddress =
+            '(Manager address: ' + this.details.managerAddress + ')';
+        }
+      }
+    }
+  ]);
diff --git a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
new file mode 100644
index 000000000..3dd61877a
--- /dev/null
+++ b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
@@ -0,0 +1,37 @@
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-code" title-text="Node Details"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <table class="table">
+          <tbody>
+            <tr>
+              <td>Node name</td>
+              <td>{{ $ctrl.details.name }}</td>
+            </tr>
+            <tr>
+              <td>Role</td>
+              <td>{{ $ctrl.details.role }} {{ $ctrl.state.managerAddress }}</td>
+            </tr>
+            <tr>
+              <td>Availability</td>
+              <td>{{ $ctrl.details.availability }}</td>
+            </tr>
+            <tr>
+              <td>Status</td>
+              <td>{{ $ctrl.details.status }}</td>
+            </tr>
+            <tr>
+              <td>Engine Labels</td>
+              <td>{{ $ctrl.details.engineLabels | commaSeperated }}</td>
+            </tr>
+            <tr>
+              <td>Node Labels</td>
+              <td>{{ $ctrl.details.nodeLabels | commaSeperated }} </td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.js b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.js
new file mode 100644
index 000000000..36c7dd752
--- /dev/null
+++ b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.js
@@ -0,0 +1,8 @@
+angular.module('portainer.docker').component('swarmNodeDetailsPanel', {
+  templateUrl:
+    'app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html',
+  controller: 'SwarmNodeDetailsPanelController',
+  bindings: {
+    details: '<'
+  }
+});