diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index 8d490712fdd3..583e5e9a38cb 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -17,6 +17,7 @@
 from django.test import TestCase, override_settings
 from django.test.client import Client
 from django.urls import reverse
+from edx_toggles.toggles.testutils import override_waffle_switch
 from markupsafe import escape
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locations import CourseLocator
@@ -35,6 +36,7 @@
     user_by_anonymous_id
 )
 from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
+from common.djangoapps.student.toggles import REDIRECT_TO_COURSEWARE_AFTER_ENROLLMENT
 from common.djangoapps.student.views import complete_course_mode_info
 from common.djangoapps.util.model_utils import USER_SETTINGS_CHANGED_EVENT_NAME
 from common.djangoapps.util.testing import EventTestMixin
@@ -900,6 +902,7 @@ def test_change_enrollment_modes(self):
 
 
 @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
+@ddt.ddt
 class ChangeEnrollmentViewTest(ModuleStoreTestCase):
     """Tests the student.views.change_enrollment view"""
 
@@ -920,6 +923,17 @@ def _enroll_through_view(self, course):
         )
         return response
 
+    @ddt.data(
+        (True, 'courseware'),
+        (False, None),
+    )
+    @ddt.unpack
+    def test_enrollment_url(self, waffle_flag_enabled, returned_view):
+        with override_waffle_switch(REDIRECT_TO_COURSEWARE_AFTER_ENROLLMENT, waffle_flag_enabled):
+            response = self._enroll_through_view(self.course)
+        data = reverse(returned_view, args=[str(self.course.id)]) if returned_view else ''
+        assert response.content.decode('utf8') == data
+
     def test_enroll_as_default(self):
         """Tests that a student can successfully enroll through this view"""
         response = self._enroll_through_view(self.course)
diff --git a/common/djangoapps/student/toggles.py b/common/djangoapps/student/toggles.py
new file mode 100644
index 000000000000..b5f074eda21c
--- /dev/null
+++ b/common/djangoapps/student/toggles.py
@@ -0,0 +1,24 @@
+"""
+Toggles for Dashboard page.
+"""
+from edx_toggles.toggles import WaffleSwitch
+
+# Namespace for student waffle flags.
+WAFFLE_FLAG_NAMESPACE = 'student'
+
+# Waffle flag to enable control redirecting after enrolment.
+# .. toggle_name: student.redirect_to_courseware_after_enrollment
+# .. toggle_implementation: WaffleSwitch
+# .. toggle_default: False
+# .. toggle_description: Redirect to courseware after enrollment instead of dashboard.
+# .. toggle_use_cases: open_edx
+# .. toggle_creation_date: 2023-02-06
+# .. toggle_target_removal_date: None
+# .. toggle_warning: None
+REDIRECT_TO_COURSEWARE_AFTER_ENROLLMENT = WaffleSwitch(
+    f'{WAFFLE_FLAG_NAMESPACE}.redirect_to_courseware_after_enrollment', __name__
+)
+
+
+def should_redirect_to_courseware_after_enrollment():
+    return REDIRECT_TO_COURSEWARE_AFTER_ENROLLMENT.is_enabled()
diff --git a/common/djangoapps/student/views/management.py b/common/djangoapps/student/views/management.py
index 66b9d6109432..03a8f40b0542 100644
--- a/common/djangoapps/student/views/management.py
+++ b/common/djangoapps/student/views/management.py
@@ -39,6 +39,7 @@
 from rest_framework.decorators import api_view, authentication_classes, permission_classes
 from rest_framework.permissions import IsAuthenticated
 
+from common.djangoapps.student.toggles import should_redirect_to_courseware_after_enrollment
 from common.djangoapps.track import views as track_views
 from lms.djangoapps.bulk_email.models import Optout
 from common.djangoapps.course_modes.models import CourseMode
@@ -400,8 +401,10 @@ def change_enrollment(request, check_access=True):
                 reverse("course_modes_choose", kwargs={'course_id': str(course_id)})
             )
 
-        # Otherwise, there is only one mode available (the default)
-        return HttpResponse()
+        if should_redirect_to_courseware_after_enrollment():
+            return HttpResponse(reverse('courseware', args=[str(course_id)]))
+        else:
+            return HttpResponse()
     elif action == "unenroll":
         if configuration_helpers.get_value(
             "DISABLE_UNENROLLMENT",