diff --git a/resources/views/partials/asset-bulk-actions.blade.php b/resources/views/partials/asset-bulk-actions.blade.php
index cf75fcfcd8..2adb62c996 100644
--- a/resources/views/partials/asset-bulk-actions.blade.php
+++ b/resources/views/partials/asset-bulk-actions.blade.php
@@ -1,9 +1,9 @@
-<div id="toolbar">
+<div id="assetsBulkEditToolbar" style="min-width:400px">
     {{ Form::open([
       'method' => 'POST',
       'route' => ['hardware/bulkedit'],
       'class' => 'form-inline',
-      'id' => 'assetToolbar']) }}
+      'id' => 'assetsBulkForm']) }}
 
 
     <label for="bulk_actions">
@@ -17,6 +17,6 @@
         <option value="labels">{{ trans_choice('button.generate_labels', 2) }}</option>
     </select>
 
-    <button class="btn btn-primary" id="bulkEdit" disabled>{{ trans('button.go') }}</button>
+    <button class="btn btn-primary" id="bulkAssetEditButton" disabled>{{ trans('button.go') }}</button>
     {{ Form::close() }}
 </div>
\ No newline at end of file
diff --git a/resources/views/partials/users-bulk-actions.blade.php b/resources/views/partials/users-bulk-actions.blade.php
index e19c54c519..016f549214 100644
--- a/resources/views/partials/users-bulk-actions.blade.php
+++ b/resources/views/partials/users-bulk-actions.blade.php
@@ -1,4 +1,4 @@
-<div id="toolbar">
+<div id="userBulkEditToolbar">
     {{ Form::open([
               'method' => 'POST',
               'route' => ['users/bulkedit'],
@@ -10,12 +10,13 @@
         <div id="users-toolbar">
             <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
             <select name="bulk_actions" class="form-control select2" style="width: 200px;" aria-label="bulk_actions">
-                <option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option>
                 <option value="edit">{{ trans('general.bulk_edit') }}</option>
+                <option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option>
                 <option value="bulkpasswordreset">{{ trans('button.send_password_link') }}</option>
             </select>
-            <button class="btn btn-default" id="bulkEditButton" disabled>{{ trans('button.go') }}</button>
+            <button class="btn btn-primary" id="bulkUserEditButton" disabled>{{ trans('button.go') }}</button>
         </div>
     @endcan
 @endif
+    {{ Form::close() }}
 </div>
\ No newline at end of file