diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade
index dda933ae..1abaccdc 100644
--- a/res/app/control-panes/device-control/device-control.jade
+++ b/res/app/control-panes/device-control/device-control.jade
@@ -17,7 +17,7 @@
             i(ng-show='!showScreen', tooltip-html-unsafe='{{"Show Screen"|translate}}', tooltip-placement='bottom').fa.fa-eye-slash
 
         .device-name-container(dropdown)
-          a.stf-vnc-device-name.pointer.unselectable.dropdown-toggle
+          a.stf-vnc-device-name.pointer.unselectable(dropdown-toggle)
             p
               .device-small-image
                 img(ng-src='/static/app/devices/icon/x24/{{ device.image || "E30HT.jpg" }}')
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index e8ce4419..c33dfb62 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -22,11 +22,11 @@
 
             span.pull-right(ng-if='activeTabs.details && !$root.basicMode')
               .btn-group(dropdown).pull-right
-                button.btn.btn-sm.btn-primary-outline.dropdown-toggle(dropdown-toggle)
+                button.btn.btn-sm.btn-primary-outline(type='button', dropdown-toggle)
                   i.fa.fa-columns
-                  span {{"Customize"|translate}}
+                  span(ng-bind='"Customize"|translate')
 
-                ul.dropdown-menu(role='menu', data-toggle='dropdown').pointer.stf-device-details-customize
+                ul.dropdown-menu(role='menu').pointer.stf-device-details-customize
                   li(ng-repeat='column in columns track by column.name',
                   ng-hide='!adminMode && columnDefinitions[column.name].admin',
                   ng-click='$event.stopPropagation()')