diff --git a/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json b/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json
new file mode 100644
index 00000000000..bbcdd4e40a8
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Code Review: Fixed a bug where some issues are missing from the code issues view for workspaces with custom names"
+}
diff --git a/packages/core/src/codewhisperer/util/zipUtil.ts b/packages/core/src/codewhisperer/util/zipUtil.ts
index 7678f9dcb12..a12f8100c44 100644
--- a/packages/core/src/codewhisperer/util/zipUtil.ts
+++ b/packages/core/src/codewhisperer/util/zipUtil.ts
@@ -114,7 +114,9 @@ export class ZipUtil {
 
         const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri)
         if (workspaceFolder) {
-            const projectName = workspaceFolder.name
+            // Note: workspaceFolder.name is not the same as the file system folder name,
+            // use the fsPath value instead
+            const projectName = path.basename(workspaceFolder.uri.fsPath)
             const relativePath = vscode.workspace.asRelativePath(uri)
             const zipEntryPath = this.getZipEntryPath(projectName, relativePath)
             zip.addFile(zipEntryPath, Buffer.from(content, 'utf-8'))