diff --git a/GPU/Common/ShaderCommon.h b/GPU/Common/ShaderCommon.h
index 3e5fe40d8a..7a93eeafd5 100644
--- a/GPU/Common/ShaderCommon.h
+++ b/GPU/Common/ShaderCommon.h
@@ -27,18 +27,17 @@ namespace Draw {
 
 enum DebugShaderType {
 	SHADER_TYPE_VERTEX = 0,
-	SHADER_TYPE_FRAGMENT = 1,
-	SHADER_TYPE_GEOMETRY = 2,
-	SHADER_TYPE_VERTEXLOADER = 3,  // Not really a shader, but might as well re-use this mechanism
-	SHADER_TYPE_PIPELINE = 4,  // Vulkan and DX12 combines a bunch of state into pipeline objects. Might as well make them inspectable.
-	SHADER_TYPE_TEXTURE = 5,
-	SHADER_TYPE_SAMPLER = 6,  // Not really a shader either. Need to rename this enum...
+	SHADER_TYPE_FRAGMENT,
+	SHADER_TYPE_VERTEXLOADER,  // Not really a shader, but might as well re-use this mechanism
+	SHADER_TYPE_PIPELINE,  // Vulkan and DX12 combines a bunch of state into pipeline objects. Might as well make them inspectable.
+	SHADER_TYPE_TEXTURE,
+	SHADER_TYPE_SAMPLER,  // Not really a shader either. Need to rename this enum...
 };
 
 enum DebugShaderStringType {
 	SHADER_STRING_SHORT_DESC = 0,
-	SHADER_STRING_SOURCE_CODE = 1,
-	SHADER_STRING_STATS = 2,
+	SHADER_STRING_SOURCE_CODE,
+	SHADER_STRING_STATS,
 };
 
 // Shared between the backends. Not all are necessarily used by each backend, but this lets us share
diff --git a/GPU/Vulkan/ShaderManagerVulkan.cpp b/GPU/Vulkan/ShaderManagerVulkan.cpp
index 6c798f398c..abf901fc5f 100644
--- a/GPU/Vulkan/ShaderManagerVulkan.cpp
+++ b/GPU/Vulkan/ShaderManagerVulkan.cpp
@@ -359,10 +359,6 @@ std::string ShaderManagerVulkan::DebugGetShaderString(std::string id, DebugShade
 			return "";
 		}
 	}
-	case SHADER_TYPE_GEOMETRY:
-	{
-		return "";
-	}
 	default:
 		return "N/A";
 	}
diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
index 665cca9720..cea1bed935 100644
--- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp
@@ -477,7 +477,6 @@ int ShaderListScreen::ListShaders(DebugShaderType shaderType, UI::LinearLayout *
 struct { DebugShaderType type; const char *name; } shaderTypes[] = {
 	{ SHADER_TYPE_VERTEX, "Vertex" },
 	{ SHADER_TYPE_FRAGMENT, "Fragment" },
-	{ SHADER_TYPE_GEOMETRY, "Geometry" },
 	{ SHADER_TYPE_VERTEXLOADER, "VertexLoader" },
 	{ SHADER_TYPE_PIPELINE, "Pipeline" },
 	{ SHADER_TYPE_TEXTURE, "Texture" },