diff --git a/src/video_core/amdgpu/liverpool.h b/src/video_core/amdgpu/liverpool.h
index 92a24795..896927df 100644
--- a/src/video_core/amdgpu/liverpool.h
+++ b/src/video_core/amdgpu/liverpool.h
@@ -452,7 +452,7 @@ struct Liverpool {
         BitField<11, 1, u32> enable_polygon_offset_front;
         BitField<12, 1, u32> enable_polygon_offset_back;
         BitField<13, 1, u32> enable_polygon_offset_para;
-        BitField<13, 1, u32> enable_window_offset;
+        BitField<16, 1, u32> enable_window_offset;
         BitField<19, 1, ProvokingVtxLast> provoking_vtx_last;
 
         PolygonMode PolyMode() const {
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
index 6bfe471c..2d502737 100644
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
@@ -172,10 +172,17 @@ GraphicsPipeline::GraphicsPipeline(const Instance& instance_, Scheduler& schedul
             .reference = key.stencil_ref_front.stencil_test_val,
         },
         .back{
-            .failOp = LiverpoolToVK::StencilOp(key.stencil.stencil_fail_back),
-            .passOp = LiverpoolToVK::StencilOp(key.stencil.stencil_zpass_back),
-            .depthFailOp = LiverpoolToVK::StencilOp(key.stencil.stencil_zfail_back),
-            .compareOp = LiverpoolToVK::CompareOp(key.depth.stencil_bf_func),
+            .failOp = LiverpoolToVK::StencilOp(key.depth.backface_enable
+                                                   ? key.stencil.stencil_fail_back
+                                                   : key.stencil.stencil_fail_front),
+            .passOp = LiverpoolToVK::StencilOp(key.depth.backface_enable
+                                                   ? key.stencil.stencil_zpass_back
+                                                   : key.stencil.stencil_zpass_front),
+            .depthFailOp = LiverpoolToVK::StencilOp(key.depth.backface_enable
+                                                        ? key.stencil.stencil_zfail_back
+                                                        : key.stencil.stencil_zfail_front),
+            .compareOp = LiverpoolToVK::CompareOp(
+                key.depth.backface_enable ? key.depth.stencil_bf_func : key.depth.stencil_ref_func),
             .compareMask = key.stencil_ref_back.stencil_mask,
             .writeMask = key.stencil_ref_back.stencil_write_mask,
             .reference = key.stencil_ref_back.stencil_test_val,
@@ -207,7 +214,8 @@ GraphicsPipeline::GraphicsPipeline(const Instance& instance_, Scheduler& schedul
         .colorAttachmentCount = num_color_formats,
         .pColorAttachmentFormats = key.color_formats.data(),
         .depthAttachmentFormat = key.depth_format,
-        .stencilAttachmentFormat = vk::Format::eUndefined,
+        .stencilAttachmentFormat =
+            key.depth.stencil_enable ? key.depth_format : vk::Format::eUndefined,
     };
 
     std::array<vk::PipelineColorBlendAttachmentState, Liverpool::NumColorBuffers> attachments;
diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cpp
index a6c2536b..10ee6ea6 100644
--- a/src/video_core/renderer_vulkan/vk_scheduler.cpp
+++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp
@@ -39,6 +39,7 @@ void Scheduler::BeginRendering(const RenderState& new_state) {
         .colorAttachmentCount = render_state.num_color_attachments,
         .pColorAttachments = render_state.color_attachments.data(),
         .pDepthAttachment = render_state.has_depth ? &render_state.depth_attachment : nullptr,
+        .pStencilAttachment = render_state.has_stencil ? &render_state.depth_attachment : nullptr,
     };
 
     current_cmdbuf.beginRendering(rendering_info);