diff --git a/src/Http/Controllers/CP/Auth/LoginController.php b/src/Http/Controllers/CP/Auth/LoginController.php
index 367d4c6a3c6..885cb5d91de 100644
--- a/src/Http/Controllers/CP/Auth/LoginController.php
+++ b/src/Http/Controllers/CP/Auth/LoginController.php
@@ -101,9 +101,11 @@ protected function guard()
 
     public function redirectPath()
     {
+        $cp = cp_route('index');
         $referer = request('referer');
+        $referredFromCp = Str::startsWith($referer, $cp) && ! Str::startsWith($referer, $cp.'/auth/');
 
-        return Str::contains($referer, '/'.config('statamic.cp.route')) ? $referer : cp_route('index');
+        return $referredFromCp ? $referer : $cp;
     }
 
     protected function authenticated(Request $request, $user)