diff --git a/src/components/widgets/gcode-preview/GcodePreview.vue b/src/components/widgets/gcode-preview/GcodePreview.vue
index 091dda7e33..261ecf1a7e 100644
--- a/src/components/widgets/gcode-preview/GcodePreview.vue
+++ b/src/components/widgets/gcode-preview/GcodePreview.vue
@@ -113,6 +113,19 @@
             :shape-rendering="shapeRendering"
           />
         </g>
+        <g
+          v-if="getViewerOption('showCurrentLayer')"
+          id="activeLayer"
+          class="layer"
+        >
+          <path
+            stroke="lightgrey"
+            :stroke-width="extrusionLineWidth"
+            stroke-opacity="0.6"
+            :d="svgPathActive.extrusions"
+            :shape-rendering="shapeRendering"
+          />
+        </g>
         <g
           id="currentLayer"
           class="layer"
@@ -421,6 +434,14 @@ export default class GcodePreview extends Mixins(StateMixin) {
     return this.$store.getters['gcodePreview/getPaths'](layer?.move ?? 0, this.progress)
   }
 
+  get svgPathActive (): LayerPaths {
+    if (this.disabled) {
+      return this.defaultLayerPaths
+    }
+
+    return this.$store.getters['gcodePreview/getLayerPaths'](this.layer)
+  }
+
   get svgPathPrevious (): LayerPaths {
     if (this.disabled || this.layer <= 0) {
       return this.defaultLayerPaths
diff --git a/src/components/widgets/gcode-preview/GcodePreviewControls.vue b/src/components/widgets/gcode-preview/GcodePreviewControls.vue
index a9c219ebc6..ab82ee72ec 100644
--- a/src/components/widgets/gcode-preview/GcodePreviewControls.vue
+++ b/src/components/widgets/gcode-preview/GcodePreviewControls.vue
@@ -6,6 +6,12 @@
       :label="$t('app.gcode.label.follow_progress')"
     />
 
+    <gcode-preview-control-checkbox
+      :disabled="disabled"
+      name="showCurrentLayer"
+      :label="$t('app.gcode.label.show_current_layer')"
+    />
+
     <gcode-preview-control-checkbox
       :disabled="disabled"
       name="showNextLayer"
diff --git a/src/locales/en.yaml b/src/locales/en.yaml
index 0ed60deb10..235e65831e 100644
--- a/src/locales/en.yaml
+++ b/src/locales/en.yaml
@@ -113,6 +113,7 @@ app:
       layer: Layer
       layers: Layers
       parsed: Parsed
+      show_current_layer: Show current layer
       show_extrusions: Show extrusions
       show_moves: Show moves
       show_next_layer: Show next layer
diff --git a/src/store/gcodePreview/index.ts b/src/store/gcodePreview/index.ts
index 14aa7a427b..0090836751 100644
--- a/src/store/gcodePreview/index.ts
+++ b/src/store/gcodePreview/index.ts
@@ -16,6 +16,7 @@ export const defaultState = (): GcodePreviewState => {
     parserWorker: null,
 
     viewer: {
+      showCurrentLayer: false,
       showNextLayer: false,
       showPreviousLayer: false,
       showMoves: true,
diff --git a/src/store/gcodePreview/types.ts b/src/store/gcodePreview/types.ts
index 145f23ca62..22069da2d6 100644
--- a/src/store/gcodePreview/types.ts
+++ b/src/store/gcodePreview/types.ts
@@ -10,6 +10,7 @@ export interface GcodePreviewState {
   parserWorker: Thread | null;
 
   viewer: {
+    showCurrentLayer: boolean;
     showNextLayer: boolean;
     showPreviousLayer: boolean;
     showMoves: boolean;