diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index 60ea24da94863e3d57c05fda6eae648534ef4f2a..9da37ba197c20611630d32957d0cbecf9885f7a5 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -97,6 +97,18 @@ class AbstractBase extends AbstractActionController
         return $this->getAuthManager()->isLoggedIn();
     }
 
+    /**
+     * Are we running in a lightbox?
+     *
+     * @return bool
+     */
+    public function inLightbox()
+    {
+        // TODO
+        // return $this->_helper->layout->getLayout() != 'lightbox'
+        return false;
+    }
+
     /**
      * Redirect the user to the login screen.
      *
@@ -113,13 +125,13 @@ class AbstractBase extends AbstractActionController
             $msg = 'You must be logged in first';
         }
 
-        /* TODO:
         // Store the current URL as a login followup action unless we are in a
         // lightbox (since lightboxes use a different followup mechanism).
-        if ($this->_helper->layout->getLayout() != 'lightbox') {
+        if (!$this->inLightbox()) {
+            /* TODO:
             $this->_helper->followup->store($extras);
+            */
         }
-         */
         if (!empty($msg)) {
             $this->flashMessenger()->setNamespace('error')->addMessage($msg);
         }
diff --git a/module/VuFind/src/VuFind/Controller/MyResearchController.php b/module/VuFind/src/VuFind/Controller/MyResearchController.php
index 883c8898a451feba973c1fba67b18ae5ddc8e45f..1a625e7eaaf06135e999c418354b1e2e590ea43e 100644
--- a/module/VuFind/src/VuFind/Controller/MyResearchController.php
+++ b/module/VuFind/src/VuFind/Controller/MyResearchController.php
@@ -136,18 +136,6 @@ class MyResearchController extends AbstractBase
         return $view;
     }
 
-    /**
-     * Are we running in a lightbox?
-     *
-     * @return bool
-     */
-    public function inLightbox()
-    {
-        // TODO
-        // return $this->_helper->layout->getLayout() != 'lightbox'
-        return false;
-    }
-
     /**
      * Login Action
      *