diff --git a/src/registrar/templates/domain_base.html b/src/registrar/templates/domain_base.html
index 0810a422e..6f79adeb5 100644
--- a/src/registrar/templates/domain_base.html
+++ b/src/registrar/templates/domain_base.html
@@ -25,7 +25,7 @@
       {% if is_analyst_or_superuser and analyst_action == 'edit' and analyst_action_location == domain.pk %}
       <div class="usa-alert usa-alert--warning">
         <div class="usa-alert__body">
-          <h4 class="usa-alert__heading larger-font-sizing ">Attention!</h4>
+          <h4 class="usa-alert__heading larger-font-sizing">Attention!</h4>
           <p class="usa-alert__text ">
             You are making changes to a registrant’s domain. When finished making changes, close this tab and inform the registrant of your updates
           </p>
diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index c4a2772b0..4e9375d29 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -518,3 +518,10 @@ def multiple_unalphabetical_domain_objects(
         application = mock.create_full_dummy_domain_object(domain_type, object_name)
         applications.append(application)
     return applications
+
+def generic_domain_object(domain_type, object_name):
+    """Returns a generic domain object of
+    domain_type 'application', 'information', or 'invitation'"""
+    mock = AuditedAdminMockData()
+    application = mock.create_full_dummy_domain_object(domain_type, object_name)
+    return application
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index a27dcb741..9d60e6ba3 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -1,7 +1,9 @@
 from django.test import TestCase, RequestFactory, Client
 from django.contrib.admin.sites import AdminSite
+from django.urls import reverse
 
 from registrar.admin import (
+    DomainAdmin,
     DomainApplicationAdmin,
     ListHeaderAdmin,
     MyUserAdmin,
@@ -13,14 +15,19 @@ from registrar.models import (
     User,
     DomainInvitation,
 )
+from registrar.models.domain import Domain
 from .common import (
+    AuditedAdminMockData,
     completed_application,
+    generic_domain_object,
     mock_user,
     create_superuser,
     create_user,
     multiple_unalphabetical_domain_objects,
 )
 
+from django.contrib.sessions.backends.db import SessionStore
+
 from django.contrib.auth import get_user_model
 
 from django.conf import settings
@@ -636,3 +643,91 @@ class AuditedAdminTest(TestCase):
         DomainInformation.objects.all().delete()
         DomainApplication.objects.all().delete()
         DomainInvitation.objects.all().delete()
+
+
+class DomainSessionVariableTest(TestCase):
+    """Test cases for session variables in Django Admin"""
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.admin = DomainAdmin(Domain, None)
+        self.client = Client(HTTP_HOST="localhost:8080")
+        self.superuser = create_superuser()
+
+    def test_session_variables_set_correctly(self):
+        """Checks if session variables are being set correctly"""
+
+        p = "adminpass"
+        self.client.login(username="superuser", password=p)
+
+        dummy_domain_information: DomainInformation = generic_domain_object("information", "session")
+        request = self.factory.post(
+            reverse('admin:registrar_domain_change', args=(dummy_domain_information.domain.pk,)),
+            {'_edit_domain': 'true'},
+            follow=True
+        )
+
+        self.populate_session_values(request, dummy_domain_information.domain)
+
+        self.assertEqual(request.session['analyst_action'], 'edit')
+        self.assertEqual(request.session['analyst_action_location'], dummy_domain_information.domain.pk)
+
+    def test_session_variables_retain_information(self):
+        """ Checks to see if session variables retain old information """
+        p = "adminpass"
+        self.client.login(username="superuser", password=p)
+
+        # We need to create multiple of these to ensure data is consistent across all of them
+        dummy_domain_information_list: [DomainInformation] = multiple_unalphabetical_domain_objects("invitation")
+        for item in dummy_domain_information_list:
+            request = self.factory.post(
+                reverse('admin:registrar_domain_change', args=(item.pk,)),
+                {'_edit_domain': 'true'},
+                follow=True
+            )
+
+            self.populate_session_values(request, item)
+
+            self.assertEqual(request.session['analyst_action'], 'edit')
+            self.assertEqual(request.session['analyst_action_location'], item.pk)
+
+    def test_session_variables_concurrent_requests(self):
+        """ Simulates two requests at once """
+        p = "adminpass"
+        self.client.login(username="superuser", password=p)
+
+        info_first: DomainInformation = generic_domain_object("information", "session")
+        info_second: DomainInformation = generic_domain_object("information", "session2")
+
+        request_first = self.factory.post(
+            reverse('admin:registrar_domain_change', args=(info_first.domain.pk,)),
+            {'_edit_domain': 'true'},
+            follow=True
+        )
+        request_second = self.factory.post(
+            reverse('admin:registrar_domain_change', args=(info_second.domain.pk,)),
+            {'_edit_domain': 'true'},
+            follow=True
+        )
+
+        self.populate_session_values(request_first, info_first.domain)
+        self.populate_session_values(request_second, info_second.domain)
+
+        # Check if anything got nulled out
+        self.assertNotEqual(request_first.session['analyst_action'], None)
+        self.assertNotEqual(request_second.session['analyst_action'], None)
+        self.assertNotEqual(request_first.session['analyst_action_location'], None)
+        self.assertNotEqual(request_second.session['analyst_action_location'], None)
+
+        # Check if they are both the same action 'type'
+        self.assertEqual(request_first.session['analyst_action'], 'edit')
+        self.assertEqual(request_second.session['analyst_action'], 'edit')
+
+        # Check their locations, and ensure they aren't the same across both
+        self.assertNotEqual(request_first.session['analyst_action_location'], request_second.session['analyst_action_location'])
+
+    def populate_session_values(self, request, domain_object):
+        """Boilerplate for creating mock sessions"""
+        request.user = self.client
+        request.session = SessionStore()
+        request.session.create()
+        self.admin.response_change(request, domain_object)
\ No newline at end of file