diff --git a/app/assets/stylesheets/bootstrap_and_overrides.scss b/app/assets/stylesheets/bootstrap_and_overrides.scss
index f2da5db5e08..83e968c5c59 100644
--- a/app/assets/stylesheets/bootstrap_and_overrides.scss
+++ b/app/assets/stylesheets/bootstrap_and_overrides.scss
@@ -219,3 +219,6 @@ body.modal-open {
   color: black;
 }
 // eof form-control-feedback
+.puppetca-filters {
+  min-width: 150px;
+}
diff --git a/app/helpers/puppetca_helper.rb b/app/helpers/puppetca_helper.rb
index e3954544e3e..56f915f1519 100644
--- a/app/helpers/puppetca_helper.rb
+++ b/app/helpers/puppetca_helper.rb
@@ -1,7 +1,7 @@
 module PuppetcaHelper
   def state_filter
     states = [N_('revoked'), N_('pending'), N_('valid')]
-    select_tag "Filter", options_for_select([''] + states.map { |s| [_(s), s] }, params[:state]),
+    select_tag "Filter", options_for_select([''] + states.map { |s| [_(s), s] }, params[:state]), :class => "puppetca-filters",
                :onchange => "window.location.href = '#{smart_proxy_puppetca_index_path(@proxy)}' + (this.value == '' ? '' : ('?state=' + this.value))"
   end
 
diff --git a/app/views/autosign/index.html.erb b/app/views/autosign/index.html.erb
index 6dd010543ff..8516e4f96b4 100644
--- a/app/views/autosign/index.html.erb
+++ b/app/views/autosign/index.html.erb
@@ -1,7 +1,7 @@
 <% title _("Autosign entries for %s") % @proxy %>
 <% title_actions display_link_if_authorized(_("Certificates"), hash_for_smart_proxy_puppetca_index_path(:smart_proxy_id => @proxy).merge(:auth_object => @proxy, :permission => 'view_smart_proxies_puppetca')),
   autosign_form %>
-<table class='table table-bordered table-striped table-condensed'>
+<table class="table table-bordered table-striped table-condensed">
   <thead>
     <tr>
       <th><%= _("Name") %></th>
diff --git a/app/views/puppetca/index.html.erb b/app/views/puppetca/index.html.erb
index bf4e5453f2e..9f51401bded 100644
--- a/app/views/puppetca/index.html.erb
+++ b/app/views/puppetca/index.html.erb
@@ -1,7 +1,7 @@
 <% title _("PuppetCA on %s") % @proxy.name %>
 <% search_bar _("Filter by state: %s") % state_filter %>
 <% title_actions display_link_if_authorized(_("Autosign Entries"), hash_for_smart_proxy_autosign_index_path(:smart_proxy_id => @proxy)) %>
-<table class='table table-bordered table-striped table-condensed'>
+<table class="table table-bordered table-striped table-condensed">
   <thead>
     <tr>
       <th><%= _("Certificate Name") %></th>