diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index fec2be99b27ef1bdab935e5f914eee1a7894309a..226d1109c0bc1da80898446f7045da3f1ffa260f 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -261,16 +261,13 @@ class AbstractBase extends AbstractActionController
             $msg = 'You must be logged in first';
         }
 
-        // If we're doing off-site login requests,
-        // we don't want to return to the lightbox
+        // We don't want to return to the lightbox
         $serverUrl = $this->getServerUrl();
-        if ($this->getAuthManager()->getSessionInitiator($serverUrl)) {
-            $serverUrl = str_replace(
-                ['?layout=lightbox', '&layout=lightbox'],
-                ['?', '&'],
-                $serverUrl
-            );
-        }
+        $serverUrl = str_replace(
+            ['?layout=lightbox', '&layout=lightbox'],
+            ['?', '&'],
+            $serverUrl
+        );
 
         // Store the current URL as a login followup action
         $this->followup()->store($extras, $serverUrl);