diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c
index 8fad7c1a7b6..cb167561af2 100644
--- a/dll/win32/shimgvw/shimgvw.c
+++ b/dll/win32/shimgvw/shimgvw.c
@@ -435,8 +435,9 @@ static void pSaveImageAs(HWND hwnd)
     sfn.hInstance   = hInstance;
     sfn.lpstrFile   = szSaveFileName;
     sfn.lpstrFilter = szFilterMask;
-    sfn.nMaxFile    = MAX_PATH;
+    sfn.nMaxFile    = _countof(szSaveFileName);
     sfn.Flags       = OFN_EXPLORER | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY;
+    sfn.lpstrDefExt = L"png";
 
     c = szFilterMask;