diff --git a/src/main.cpp b/src/main.cpp
index dfc2f3213..b0f839509 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3889,6 +3889,14 @@ end_of_code_gen:;
 		if (!build_context.keep_executable) {
 			char const *filename = cast(char const *)exe_name.text;
 			gb_file_remove(filename);
+
+			if (build_context.metrics.os == TargetOs_windows && build_context.ODIN_DEBUG) {
+				String pdb_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_PDB]);
+				defer (gb_free(heap_allocator(), pdb_path.text));
+
+				filename = cast(char const *)pdb_path.text;
+				gb_file_remove(filename);
+			}
 		}
 	}
 	return 0;