diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h
index 6eb98080d2..c8920da50d 100644
--- a/src/video_core/engines/maxwell_3d.h
+++ b/src/video_core/engines/maxwell_3d.h
@@ -148,7 +148,7 @@ public:
                     u32 cb_data[NumCBData];
                 } const_buffer;
 
-                INSERT_PADDING_WORDS(0x74);
+                INSERT_PADDING_WORDS(0x10);
 
                 struct {
                     union {
@@ -158,13 +158,7 @@ public:
                     INSERT_PADDING_WORDS(7);
                 } cb_bind[MaxShaderType];
 
-                INSERT_PADDING_WORDS(0x494);
-
-                struct {
-                    u32 set_shader_call;
-                    u32 set_shader_args;
-                } set_shader;
-                INSERT_PADDING_WORDS(0x10);
+                INSERT_PADDING_WORDS(0x50A);
             };
             std::array<u32, NUM_REGS> reg_array;
         };
@@ -217,7 +211,7 @@ ASSERT_REG_POSITION(vertex_array[0], 0x700);
 ASSERT_REG_POSITION(vertex_array_limit[0], 0x7C0);
 ASSERT_REG_POSITION(shader_config[0], 0x800);
 ASSERT_REG_POSITION(const_buffer, 0x8E0);
-ASSERT_REG_POSITION(set_shader, 0xE24);
+ASSERT_REG_POSITION(cb_bind[0], 0x904);
 
 #undef ASSERT_REG_POSITION