diff --git a/html/includes/hostbox-basic.inc.php b/html/includes/hostbox-basic.inc.php
index 094e7a727..c46713d7c 100644
--- a/html/includes/hostbox-basic.inc.php
+++ b/html/includes/hostbox-basic.inc.php
@@ -27,23 +27,24 @@ if ($device['os'] == "ios") { formatCiscoHardware($device, true); }
 $device['os_text'] = $config['os'][$device['os']]['text'];
 $image = getImage($device);
 
-echo('  <tr onclick="location.href=\'device/'.$device['device_id'].'/\'" style="cursor: pointer;">
-          <td class="'. $class .' "></td>
-          <td>' . $image . '</td>
-          <td><span style="font-size: 15px;">' . generate_device_link($device) . '</span></td>'
+echo('  <tr>
+          <td class="'. $class .' " '. $cell_click .'></td>
+          <td '. $cell_click .'>' . $image . '</td>
+          <td '. $cell_click .'><span style="font-size: 15px;">' . generate_device_link($device) . '</span></td>'
         );
 
-echo('<td>');
+echo('<td '. $cell_click .'>');
 if ($port_count) { echo(' <img src="images/icons/port.png" align=absmiddle /> '.$port_count); }
 echo('<br />');
 if ($sensor_count) { echo(' <img src="images/icons/sensors.png" align=absmiddle /> '.$sensor_count); }
 echo('</td>');
-echo('    <td>' . $device['hardware'] . ' ' . $device['features'] . '</td>');
-echo('    <td>' . $device['os_text'] . ' ' . $device['version'] . '</td>');
-echo('    <td>' . formatUptime($device['uptime'], 'short') . ' <br />');
+echo('    <td '. $cell_click .'>' . $device['hardware'] . ' ' . $device['features'] . '</td>');
+echo('    <td '. $cell_click .'>' . $device['os_text'] . ' ' . $device['version'] . '</td>');
+echo('    <td '. $cell_click .'>' . formatUptime($device['uptime'], 'short') . ' <br />');
 
 if (get_dev_attrib($device,'override_sysLocation_bool')) {  $device['location'] = get_dev_attrib($device,'override_sysLocation_string'); }
 echo('    ' . truncate($device['location'],32, '') . '</td>');
+require 'hostbox-menu.inc.php';
 
 echo(' </tr>');
 
diff --git a/html/includes/hostbox-menu.inc.php b/html/includes/hostbox-menu.inc.php
new file mode 100644
index 000000000..c34d8e94d
--- /dev/null
+++ b/html/includes/hostbox-menu.inc.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+echo('<td><div class="collapse navbar-collapse" id="navHeaderCollapse">
+          <div class="btn-group">
+              <button type="button" class="btn btn-sm btn-danger dropdown-toggle" data-toggle="dropdown" aria-expand="false">Action <span class="caret"></span></button>
+              <ul class="dropdown-menu dropdown-menu-right">');
+    if (device_permitted($device['device_id'])) {
+        echo '<li><a href="'.generate_device_url($device).'"> <img src="images/16/server.png" border="0" align="absmiddle" /> View device</a></li>';
+        echo '<li><a href="'.generate_device_url($device, array('tab' => 'alerts')).'"> <img src="images/16/bell.png" border="0" align="absmiddle" /> View alerts</a></li>';
+        if ($_SESSION['userlevel'] >= "7") {
+            echo '<li><a href="'.generate_device_url($device, array('tab' => 'edit')).'"> <img src="images/16/wrench.png" border="0" align="absmiddle" /> Edit device</a></li>';
+        }
+    }
+echo('
+              </ul>
+          </div>
+      </div></td>');
+
+?>
diff --git a/html/includes/hostbox.inc.php b/html/includes/hostbox.inc.php
index 021412225..454039adf 100644
--- a/html/includes/hostbox.inc.php
+++ b/html/includes/hostbox.inc.php
@@ -35,24 +35,25 @@ $device['os_text'] = $config['os'][$device['os']]['text'];
 $port_count   = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE `device_id` = ?", array($device['device_id']));
 $sensor_count = dbFetchCell("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = ?", array($device['device_id']));
 
-echo('  <tr onclick="location.href=\'device/device='.$device['device_id'].'/\'" style="cursor: pointer;">
-          <td class="'. $table_tab_colour .'"></td>
-          <td>' . $image . '</td>
-          <td><span style="font-size: 15px;">' . generate_device_link($device) . '</span>
+echo('  <tr>
+          <td class="'. $table_tab_colour .' '. $cell_click .'"></td>
+          <td '. $cell_click .'>' . $image . '</td>
+          <td '. $cell_click .'><span style="font-size: 15px;">' . generate_device_link($device) . '</span>
           <br />' . $device['sysName'] . '</td>'
         );
 
-echo('<td>');
+echo('<td '. $cell_click .'>');
 if ($port_count) { echo(' <img src="images/icons/port.png" align=absmiddle /> '.$port_count); }
 echo('<br />');
 if ($sensor_count) { echo(' <img src="images/icons/sensors.png" align=absmiddle /> '.$sensor_count); }
 echo('</td>');
-echo('    <td>' . $device['hardware'] . '<br />' . $device['features'] . '</td>');
-echo('    <td>' . $device['os_text'] . '<br />' . $device['version'] . '</td>');
-echo('    <td>' . formatUptime($device['uptime'], 'short') . ' <br />');
+echo('    <td '. $cell_click .'>' . $device['hardware'] . '<br />' . $device['features'] . '</td>');
+echo('    <td '. $cell_click .'>' . $device['os_text'] . '<br />' . $device['version'] . '</td>');
+echo('    <td '. $cell_click .'>' . formatUptime($device['uptime'], 'short') . ' <br />');
 
 if (get_dev_attrib($device,'override_sysLocation_bool')) {  $device['location'] = get_dev_attrib($device,'override_sysLocation_string'); }
 echo('    ' . truncate($device['location'],32, '') . '</td>');
+require 'hostbox-menu.inc.php';
 
 echo(' </tr>');
 
diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index 78ea28f66..1e7af240d 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -283,6 +283,7 @@ if($format == "graph")
     <th>Platform</th>
     <th>Operating System</th>
     <th>Uptime/Location</th>
+    <th>Actions</th>
   </tr>');
   }
 
@@ -293,6 +294,7 @@ if($format == "graph")
       if (!$location_filter || ((get_dev_attrib($device,'override_sysLocation_bool') && get_dev_attrib($device,'override_sysLocation_string') == $location_filter)
         || $device['location'] == $location_filter))
       {
+        $cell_click = 'onclick="location.href=\'device/device='.$device['device_id'].'/\'" style="cursor: pointer;"';
         if ($subformat == "detail")
         {
           include("includes/hostbox.inc.php");