diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 91601b0b..67c4742e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -15,7 +15,7 @@ class ApplicationController < ActionController::Base
   end
 
   def render_not_authorized
-    redirect_to(:root, alert: t('application.not_authorized'))
+    redirect_to(request.referrer || :root, alert: t('application.not_authorized'))
   end
   private :render_not_authorized
 
diff --git a/lib/assets/javascripts/flash.js b/lib/assets/javascripts/flash.js
index 7f53f2bb..d7273864 100644
--- a/lib/assets/javascripts/flash.js
+++ b/lib/assets/javascripts/flash.js
@@ -1,4 +1,4 @@
-(function() {
+$( document ).on('turbolinks:load', function() {
   var DURATION = 10000;
   var SEVERITIES = ['danger', 'info', 'success', 'warning'];
 
@@ -48,4 +48,4 @@
 
   generateMethods();
   $(showFlashes);
-})();
+});