diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index ab967548e..1e39e67a1 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -262,4 +262,9 @@ var HelperModule = (function(){
       $('.modal').modal('hide');
     });
   });
-})();
+
+  /* Fix .selectpicker (bootstrap-select) to work with Turbolinks 5.x */
+  $(document).on('turbolinks:load', function() {
+    $(window).trigger('load.bs.select.data-api');
+  });
+})();
\ No newline at end of file
diff --git a/app/assets/javascripts/users/settings/teams/invite_users_modal.js b/app/assets/javascripts/users/settings/teams/invite_users_modal.js
index 51cd11c53..638d2c330 100644
--- a/app/assets/javascripts/users/settings/teams/invite_users_modal.js
+++ b/app/assets/javascripts/users/settings/teams/invite_users_modal.js
@@ -173,8 +173,11 @@
     });
   }
 
-  $('[data-role=invite-users-modal]').each(function() {
-    initializeModal($(this));
+  $(document).on('turbolinks:load', function() {
+    $('[data-role=invite-users-modal]').each(function() {
+      initializeModal($(this));
+    });
+
+    initializeModalsToggle();
   });
-  initializeModalsToggle();
 }());