diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index f2ba67bb61a..611a90045ae 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -132,6 +132,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       } else {
         const authUrl = loginMethod.get('customUrl') || Discourse.getURL("/auth/" + name);
         if (loginMethod.get("fullScreenLogin")) {
+          document.cookie = "fsl=true";
           window.location = authUrl;
         } else {
           this.set('authenticate', name);
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 0c151cf29a5..6a0f368d005 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -57,7 +57,8 @@ class Users::OmniauthCallbacksController < ApplicationController
       @auth_result.authenticator_name = authenticator.name
       complete_response_data
 
-      if provider && provider.full_screen_login
+      if provider && (provider.full_screen_login || cookies['fsl'])
+        cookies.delete('fsl')
         cookies['_bypass_cache'] = true
         flash[:authentication_data] = @auth_result.to_client_hash.to_json
         redirect_to @origin