diff --git a/app/components/course-page/previous-steps-incomplete-overlay.hbs b/app/components/course-page/previous-steps-incomplete-overlay.hbs
new file mode 100644
index 0000000000..efde57356f
--- /dev/null
+++ b/app/components/course-page/previous-steps-incomplete-overlay.hbs
@@ -0,0 +1,17 @@
+<BlurredOverlay
+  @isBlurred={{this.shouldShowModal}}
+  {{did-update this.handleStepIdUpdated @currentStep.id}}
+  @overlayClass="bg-gray-200 bg-opacity-20 dark:bg-gray-800 dark:bg-opacity-20"
+  ...attributes
+>
+  <:content>
+    {{yield}}
+  </:content>
+  <:overlay>
+    <CoursePage::PreviousStepsIncompleteModal
+      class="mt-8 mx-3 md:mx-6"
+      @onClose={{this.handleModalDismissed}}
+      @activeStep={{this.coursePageState.activeStep}}
+    />
+  </:overlay>
+</BlurredOverlay>
\ No newline at end of file
diff --git a/app/components/course-page/previous-steps-incomplete-overlay.ts b/app/components/course-page/previous-steps-incomplete-overlay.ts
new file mode 100644
index 0000000000..bf862303cc
--- /dev/null
+++ b/app/components/course-page/previous-steps-incomplete-overlay.ts
@@ -0,0 +1,55 @@
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+import { service } from '@ember/service';
+import Component from '@glimmer/component';
+import type CoursePageStateService from 'codecrafters-frontend/services/course-page-state';
+import { Step } from 'codecrafters-frontend/utils/course-page-step-list';
+
+interface Signature {
+  Element: HTMLDivElement;
+
+  Args: {
+    currentStep: Step;
+  };
+
+  Blocks: {
+    default: [];
+  };
+}
+
+export default class PreviousStepsIncompleteOverlayComponent extends Component<Signature> {
+  @tracked modalWasDismissed = false;
+  @tracked lastSeenStepId: string | null = null;
+
+  @service declare coursePageState: CoursePageStateService;
+
+  get shouldShowModal(): boolean {
+    // This _shouldn't_ happen as long as we're always rendered in the course page, but let's be safe
+    if (!this.coursePageState.activeStep) {
+      return false;
+    }
+
+    return !this.modalWasDismissed && this.args.currentStep.status === 'locked';
+  }
+
+  @action
+  handleModalDismissed() {
+    this.modalWasDismissed = true;
+  }
+
+  @action
+  handleStepIdUpdated() {
+    if (this.args.currentStep.id === this.lastSeenStepId) {
+      return;
+    }
+
+    this.lastSeenStepId = this.args.currentStep.id;
+    this.modalWasDismissed = false;
+  }
+}
+
+declare module '@glint/environment-ember-loose/registry' {
+  export default interface Registry {
+    'CoursePage::PreviousStepsIncompleteOverlay': typeof PreviousStepsIncompleteOverlayComponent;
+  }
+}
diff --git a/app/components/course-page/step-content.hbs b/app/components/course-page/step-content.hbs
index ab9fe9dde7..fcb0b4a5db 100644
--- a/app/components/course-page/step-content.hbs
+++ b/app/components/course-page/step-content.hbs
@@ -9,21 +9,5 @@
     />
   {{/if}}
 
-  <BlurredOverlay
-    @isBlurred={{this.shouldShowPreviousStepsIncompleteModal}}
-    @overlayClass="bg-gray-200 bg-opacity-20 dark:bg-gray-800 dark:bg-opacity-20"
-    class="px-3 md:px-6 lg:px-10"
-    {{did-update this.handleStepIdUpdated @step.id}}
-  >
-    <:content>
-      {{yield}}
-    </:content>
-    <:overlay>
-      <CoursePage::PreviousStepsIncompleteModal
-        class="mt-8 mx-3 md:mx-6"
-        @onClose={{this.handlePreviousStepsIncompleteModalDismissed}}
-        @activeStep={{this.coursePageState.activeStep}}
-      />
-    </:overlay>
-  </BlurredOverlay>
+  {{yield}}
 </div>
\ No newline at end of file
diff --git a/app/controllers/course/setup.ts b/app/controllers/course/setup.ts
index 1792cea08e..0c49d841a6 100644
--- a/app/controllers/course/setup.ts
+++ b/app/controllers/course/setup.ts
@@ -2,9 +2,14 @@ import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import type { ModelType } from 'codecrafters-frontend/routes/course/setup';
 import type CoursePageStateService from 'codecrafters-frontend/services/course-page-state';
+import type { Step } from 'codecrafters-frontend/utils/course-page-step-list';
 
 export default class CourseSetupController extends Controller {
   declare model: ModelType;
 
   @service declare coursePageState: CoursePageStateService;
+
+  get currentStep(): Step {
+    return this.coursePageState.activeStep as Step;
+  }
 }
diff --git a/app/templates/course/base-stages-completed.hbs b/app/templates/course/base-stages-completed.hbs
index 2bad2dc901..5015a5443c 100644
--- a/app/templates/course/base-stages-completed.hbs
+++ b/app/templates/course/base-stages-completed.hbs
@@ -1,3 +1,3 @@
-<div class="pt-8 pb-16">
+<div class="pt-8 pb-16 px-3 md:px-6 lg:px-10">
   <CoursePage::BaseStagesCompletedCard @repository={{@model.activeRepository}} />
 </div>
\ No newline at end of file
diff --git a/app/templates/course/completed.hbs b/app/templates/course/completed.hbs
index 4afda47912..485610c7bc 100644
--- a/app/templates/course/completed.hbs
+++ b/app/templates/course/completed.hbs
@@ -1,4 +1,4 @@
 {{! @glint-nocheck: not typesafe yet !}}
-<div class="pt-8 pb-16">
+<div class="pt-8 pb-16 px-3 md:px-6 lg:px-10">
   <CoursePage::CourseCompletedCard @repository={{@model.activeRepository}} />
 </div>
\ No newline at end of file
diff --git a/app/templates/course/extension-completed.hbs b/app/templates/course/extension-completed.hbs
index 18c9035bb3..d8a754a3fc 100644
--- a/app/templates/course/extension-completed.hbs
+++ b/app/templates/course/extension-completed.hbs
@@ -1,3 +1,3 @@
-<div class="pt-8 pb-16">
+<div class="pt-8 pb-16 px-3 md:px-6 lg:px-10">
   <CoursePage::ExtensionCompletedCard @repository={{@model.activeRepository}} @extension={{@model.extension}} />
 </div>
\ No newline at end of file
diff --git a/app/templates/course/introduction.hbs b/app/templates/course/introduction.hbs
index ffe25d8baa..a159e80fce 100644
--- a/app/templates/course/introduction.hbs
+++ b/app/templates/course/introduction.hbs
@@ -1,4 +1,4 @@
-<div class="w-full pt-8 pb-32">
+<div class="w-full pt-8 pb-32 px-3 md:px-6 lg:px-10">
   {{#if this.authenticator.currentUser.pendingProductWalkthroughFeatureSuggestion}}
     <ProductWalkthroughFeatureSuggestion
       @featureSuggestion={{this.authenticator.currentUser.pendingProductWalkthroughFeatureSuggestion}}
diff --git a/app/templates/course/setup.hbs b/app/templates/course/setup.hbs
index 2a19f4b99b..989afccbe1 100644
--- a/app/templates/course/setup.hbs
+++ b/app/templates/course/setup.hbs
@@ -1,3 +1,5 @@
-<div class="w-full pt-8 pb-32">
-  <CoursePage::SetupStep::RepositorySetupCard @repository={{@model.activeRepository}} />
-</div>
\ No newline at end of file
+<CoursePage::PreviousStepsIncompleteOverlay @currentStep={{this.currentStep}}>
+  <div class="w-full pt-8 pb-32 px-3 md:px-6 lg:px-10">
+    <CoursePage::SetupStep::RepositorySetupCard @repository={{@model.activeRepository}} />
+  </div>
+</CoursePage::PreviousStepsIncompleteOverlay>
\ No newline at end of file
diff --git a/app/templates/course/stage/code-examples.hbs b/app/templates/course/stage/code-examples.hbs
index f3275a25a0..30bac05867 100644
--- a/app/templates/course/stage/code-examples.hbs
+++ b/app/templates/course/stage/code-examples.hbs
@@ -1,5 +1,5 @@
 <div
-  class="pt-8 pb-32"
+  class="pt-8 pb-32 px-3 md:px-6 lg:px-10"
   {{did-update (fn (mut this.stageIncompleteModalWasDismissed) false) this.courseStage}}
   {{did-update this.loadSolutions this.courseStage}}
   {{did-insert this.loadSolutions}}
diff --git a/app/templates/course/stage/concepts.hbs b/app/templates/course/stage/concepts.hbs
index 2e5c849dea..db325516f4 100644
--- a/app/templates/course/stage/concepts.hbs
+++ b/app/templates/course/stage/concepts.hbs
@@ -1,4 +1,4 @@
-<div class="pt-8 pb-32" data-test-concepts-tab>
+<div class="pt-8 pb-32 px-3 md:px-6 lg:px-10" data-test-concepts-tab>
   <AlertWithIcon class="mb-6">
     Concepts are interactive tutorials that teach you fundamental concepts related to this challenge.
     <br />
diff --git a/app/templates/course/stage/instructions.hbs b/app/templates/course/stage/instructions.hbs
index 1b5bb30b4f..1dfcd5683d 100644
--- a/app/templates/course/stage/instructions.hbs
+++ b/app/templates/course/stage/instructions.hbs
@@ -1,101 +1,103 @@
-<div class="pt-6 pb-32">
-  {{#if this.shouldShowUpgradePrompt}}
-    <CoursePage::CourseStageStep::UpgradePrompt @featureSlugToHighlight="content" class="mb-6" />
-  {{/if}}
+<CoursePage::PreviousStepsIncompleteOverlay @currentStep={{this.currentStep}}>
+  <div class="pt-6 pb-32 px-3 md:px-6 lg:px-10">
+    {{#if this.shouldShowUpgradePrompt}}
+      <CoursePage::CourseStageStep::UpgradePrompt @featureSlugToHighlight="content" class="mb-6" />
+    {{/if}}
 
-  {{#if this.shouldShowFeedbackPrompt}}
-    <CoursePage::CourseStageStep::FeedbackPrompt
-      @courseStage={{@model.courseStage}}
-      @repository={{@model.activeRepository}}
-      @onSubmit={{this.handleStageFeedbackSubmitted}}
-      class="mb-6"
-    />
-  {{/if}}
-
-  {{#if (gt this.badgeAwards.length 0)}}
-    <CoursePage::CourseStageStep::EarnedBadgeNotice @badgeAwards={{this.badgeAwards}} class="mb-6" />
-  {{/if}}
+    {{#if this.shouldShowFeedbackPrompt}}
+      <CoursePage::CourseStageStep::FeedbackPrompt
+        @courseStage={{@model.courseStage}}
+        @repository={{@model.activeRepository}}
+        @onSubmit={{this.handleStageFeedbackSubmitted}}
+        class="mb-6"
+      />
+    {{/if}}
 
-  {{#if @model.courseStage.isFirst}}
-    <CoursePage::CourseStageStep::FirstStageTutorialCard @repository={{@model.activeRepository}} @courseStage={{@model.courseStage}} class="mb-6" />
-  {{/if}}
+    {{#if (gt this.badgeAwards.length 0)}}
+      <CoursePage::CourseStageStep::EarnedBadgeNotice @badgeAwards={{this.badgeAwards}} class="mb-6" />
+    {{/if}}
 
-  {{#if @model.courseStage.isSecond}}
-    <CoursePage::CourseStageStep::SecondStageInstructionsCard
-      @repository={{@model.activeRepository}}
-      @courseStage={{@model.courseStage}}
-      class="mb-6"
-    />
-  {{/if}}
+    {{#if @model.courseStage.isFirst}}
+      <CoursePage::CourseStageStep::FirstStageTutorialCard @repository={{@model.activeRepository}} @courseStage={{@model.courseStage}} class="mb-6" />
+    {{/if}}
 
-  {{#if this.shouldShowTestRunnerCard}}
-    <div class="mb-6">
-      <CoursePage::CourseStageStep::TestRunnerCard
-        @isCollapsible={{or this.shouldSuppressTestRunnerCardExpands (not-eq this.currentStep.testsStatus "passed")}}
+    {{#if @model.courseStage.isSecond}}
+      <CoursePage::CourseStageStep::SecondStageInstructionsCard
         @repository={{@model.activeRepository}}
-        @stage={{@model.courseStage}}
-        @onExpand={{if this.shouldSuppressTestRunnerCardExpands this.handleTestRunnerCardExpandedOnFirstStage undefined}}
+        @courseStage={{@model.courseStage}}
+        class="mb-6"
       />
+    {{/if}}
 
-      {{#if this.shouldSuppressTestRunnerCardExpands}}
-        <EmberPopover @popperContainer="body">
-          <div class="prose prose-sm prose-invert text-white">
-            {{#if (eq this.currentStep.testsStatus "failed")}}
-              <p>
-                This failure is expected! Check the
-                <a href="#first-stage-tutorial-card">How to pass this stage</a>
-                section for instructions.
-              </p>
-            {{else}}
-              <p>
-                Check the
-                <a href="#first-stage-tutorial-card">How to pass this stage</a>
-                section for instructions.
-              </p>
-            {{/if}}
-          </div>
-        </EmberPopover>
-      {{/if}}
-    </div>
-  {{/if}}
+    {{#if this.shouldShowTestRunnerCard}}
+      <div class="mb-6">
+        <CoursePage::CourseStageStep::TestRunnerCard
+          @isCollapsible={{or this.shouldSuppressTestRunnerCardExpands (not-eq this.currentStep.testsStatus "passed")}}
+          @repository={{@model.activeRepository}}
+          @stage={{@model.courseStage}}
+          @onExpand={{if this.shouldSuppressTestRunnerCardExpands this.handleTestRunnerCardExpandedOnFirstStage undefined}}
+        />
 
-  {{! TODO: Bring this back? }}
-  {{!-- {{#if this.shouldShowPrerequisites}}
-    <CoursePage::CourseStageStep::PrerequisitesCard @repository={{@model.activeRepository}} @courseStage={{@model.courseStage}} class="mb-6" />
-  {{/if}} --}}
+        {{#if this.shouldSuppressTestRunnerCardExpands}}
+          <EmberPopover @popperContainer="body">
+            <div class="prose prose-sm prose-invert text-white">
+              {{#if (eq this.currentStep.testsStatus "failed")}}
+                <p>
+                  This failure is expected! Check the
+                  <a href="#first-stage-tutorial-card">How to pass this stage</a>
+                  section for instructions.
+                </p>
+              {{else}}
+                <p>
+                  Check the
+                  <a href="#first-stage-tutorial-card">How to pass this stage</a>
+                  section for instructions.
+                </p>
+              {{/if}}
+            </div>
+          </EmberPopover>
+        {{/if}}
+      </div>
+    {{/if}}
 
-  <CoursePage::CourseStageStep::YourTaskCard @repository={{@model.activeRepository}} @courseStage={{@model.courseStage}} />
+    {{! TODO: Bring this back? }}
+    {{!-- {{#if this.shouldShowPrerequisites}}
+      <CoursePage::CourseStageStep::PrerequisitesCard @repository={{@model.activeRepository}} @courseStage={{@model.courseStage}} class="mb-6" />
+    {{/if}} --}}
 
-  {{#if this.shouldShowLanguageGuide}}
-    <CoursePage::CourseStageStep::LanguageGuideCard @repository={{@model.activeRepository}} @courseStage={{@model.courseStage}} class="mt-6" />
-  {{/if}}
+    <CoursePage::CourseStageStep::YourTaskCard @repository={{@model.activeRepository}} @courseStage={{@model.courseStage}} />
 
-  <div data-percy-hints-section>
-    <div class="border-b dark:border-white/5 pb-2 mb-6 mt-8 flex items-center justify-between">
-      <h2 class="font-semibold text-lg text-gray-800 dark:text-gray-200">Hints</h2>
+    {{#if this.shouldShowLanguageGuide}}
+      <CoursePage::CourseStageStep::LanguageGuideCard @repository={{@model.activeRepository}} @courseStage={{@model.courseStage}} class="mt-6" />
+    {{/if}}
 
-      {{#if @model.activeRepository.language}}
-        <div class="flex items-center gap-1">
-          <span class="text-xs text-gray-500 mr-2">Filter by {{@model.activeRepository.language.name}}</span>
-          <Toggle @isOn={{this.commentListIsFilteredByLanguage}} {{on "click" this.handleCommentListFilterToggled}} />
+    <div data-percy-hints-section>
+      <div class="border-b dark:border-white/5 pb-2 mb-6 mt-8 flex items-center justify-between">
+        <h2 class="font-semibold text-lg text-gray-800 dark:text-gray-200">Hints</h2>
 
-          <EmberTooltip>
-            {{#if this.commentListIsFilteredByLanguage}}
-              You're currently viewing hints that are relevant to
-              {{@model.activeRepository.language.name}}. Turn this off to view hints for all languages.
-            {{else}}
-              You're currently viewing hints for all languages. Turn this on to filter hints that are relevant to
-              {{@model.activeRepository.language.name}}.
-            {{/if}}
-          </EmberTooltip>
-        </div>
-      {{/if}}
-    </div>
+        {{#if @model.activeRepository.language}}
+          <div class="flex items-center gap-1">
+            <span class="text-xs text-gray-500 mr-2">Filter by {{@model.activeRepository.language.name}}</span>
+            <Toggle @isOn={{this.commentListIsFilteredByLanguage}} {{on "click" this.handleCommentListFilterToggled}} />
+
+            <EmberTooltip>
+              {{#if this.commentListIsFilteredByLanguage}}
+                You're currently viewing hints that are relevant to
+                {{@model.activeRepository.language.name}}. Turn this off to view hints for all languages.
+              {{else}}
+                You're currently viewing hints for all languages. Turn this on to filter hints that are relevant to
+                {{@model.activeRepository.language.name}}.
+              {{/if}}
+            </EmberTooltip>
+          </div>
+        {{/if}}
+      </div>
 
-    <CoursePage::CommentList
-      @courseStage={{@model.courseStage}}
-      @language={{@model.activeRepository.language}}
-      @shouldFilterByLanguage={{this.commentListIsFilteredByLanguage}}
-    />
+      <CoursePage::CommentList
+        @courseStage={{@model.courseStage}}
+        @language={{@model.activeRepository.language}}
+        @shouldFilterByLanguage={{this.commentListIsFilteredByLanguage}}
+      />
+    </div>
   </div>
-</div>
\ No newline at end of file
+</CoursePage::PreviousStepsIncompleteOverlay>
\ No newline at end of file
diff --git a/app/templates/course/stage/screencasts.hbs b/app/templates/course/stage/screencasts.hbs
index 51ebbae144..efeee144f6 100644
--- a/app/templates/course/stage/screencasts.hbs
+++ b/app/templates/course/stage/screencasts.hbs
@@ -1,4 +1,4 @@
-<div class="pt-8 pb-16" data-test-screencasts-tab>
+<div class="pt-8 pb-16 px-3 md:px-6 lg:px-10" data-test-screencasts-tab>
   <AlertWithIcon class="mb-6">
     Screencasts are recordings of CodeCrafters users passing this stage. This is a beta feature, please send us
     <div class="inline-flex">
diff --git a/tests/acceptance/course-page/view-code-examples-test.js b/tests/acceptance/course-page/view-code-examples-test.js
index dd69c669c2..303583cf67 100644
--- a/tests/acceptance/course-page/view-code-examples-test.js
+++ b/tests/acceptance/course-page/view-code-examples-test.js
@@ -187,7 +187,6 @@ module('Acceptance | course-page | view-code-examples', function (hooks) {
     await courseOverviewPage.clickOnStartCourse();
     await coursePage.sidebar.clickOnStepListItem('Respond to PING');
     await coursePage.yourTaskCard.clickOnActionButton('Code Examples');
-    await coursePage.previousStepsIncompleteModal.clickOnJustExploringButton();
 
     assert.strictEqual(coursePage.codeExamplesTab.solutionCards[0].changedFiles.length, 2, 'shows 2 changed files');
     assert.strictEqual(coursePage.codeExamplesTab.solutionCards[0].unchangedFiles.length, 2, 'shows 2 unchanged files');
@@ -594,7 +593,6 @@ module('Acceptance | course-page | view-code-examples', function (hooks) {
     await catalogPage.clickOnCourse('Build your own Redis');
     await courseOverviewPage.clickOnStartCourse();
     await coursePage.sidebar.clickOnStepListItem('Implement the ECHO command');
-    await coursePage.previousStepsIncompleteModal.clickOnJustExploringButton();
     await coursePage.yourTaskCard.clickOnActionButton('Code Examples');
 
     await coursePage.codeExamplesTab.languageDropdown.toggle();