diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9061fac..2487259 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -36,7 +36,7 @@ class ApplicationController < ActionController::Base
   end
 
   def store_location
-    session[:return_to] = request.env['REQUEST_URI']
+    session[:return_to] = request.env['REQUEST_URI'] || request.original_fullpath
   end
 
   def get_stored_location