diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 4cdefbd47..63822a19e 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -13,6 +13,8 @@
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= heads_for_theme %>
+<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/css/select2.min.css" rel="stylesheet" />
+<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index b6352fd2a..65e705a59 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -850,6 +850,12 @@ function keepAnchorOnSignIn(form){
   return true;
 }
 
+$(document).ready(function(){
+  $('select:not([multiple])').select2({
+    width: '100%'
+  });
+});
+
 $(document).ready(setupAjaxIndicator);
 $(document).ready(hideOnLoad);
 $(document).ready(addFormObserversForDoubleSubmit);