diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
index bcb2b2c29..f0d99d579 100644
--- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
+++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
@@ -2551,7 +2551,7 @@ function MaterialEditorGui::saveCompositeMap(%this)
     %saveAs = "";
     %dlg = new SaveFileDialog()
     {
-        Filters        = "png";
+        Filters        = "PNG File (*.png)|*.png";
         DefaultPath    = EditorSettings.value("data/");
         ChangePath     = false;
         OverwritePrompt   = true;
@@ -2565,6 +2565,9 @@ function MaterialEditorGui::saveCompositeMap(%this)
         %saveAs = %dlg.FileName;
     }
     
+   if( fileExt( %saveAs ) !$= ".png" )
+      %saveAs = %saveAs @ ".png";
+    
     %material = %this.currentMaterial;
     %layer = %this.currentLayer;