diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
index 872775f08a..4af33d19ff 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
@@ -216,6 +216,8 @@ void AtlasWindow::OnOpen(wxCommandEvent& WXUNUSED(event))
 	}
 
 	wxFileDialog dlg (this, _("Select XML file to open"), path, name, _("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxFD_OPEN);
+	// Set default filter
+	dlg.SetFilterIndex(0);
 
 	if (dlg.ShowModal() != wxID_OK)
 		return;
@@ -263,6 +265,8 @@ bool AtlasWindow::SaveChanges(bool forceSaveAs)
 			GetCurrentFilename().GetPath(), GetCurrentFilename().GetFullName(),
 			//_T(""), _T(""),
 			_("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+		// Set default filter
+		dlg.SetFilterIndex(0);
 
 		if (dlg.ShowModal() != wxID_OK)
 			return false;
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
index 2dbddfc899..ff249d7c41 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
@@ -650,6 +650,8 @@ void ScenarioEditor::OnOpen(wxCommandEvent& WXUNUSED(event))
 		Datafile::GetDataDirectory() + _T("/mods/public/maps/scenarios"), m_OpenFilename,
 		_T("PMP files (*.pmp)|*.pmp|All files (*.*)|*.*"),
 		wxFD_OPEN);
+	// Set default filter
+	dlg.SetFilterIndex(0);
 
 	wxString cwd = wxFileName::GetCwd();
 	
@@ -708,6 +710,8 @@ void ScenarioEditor::OnSaveAs(wxCommandEvent& WXUNUSED(event))
 		Datafile::GetDataDirectory() + _T("/mods/public/maps/scenarios"), m_OpenFilename,
 		_T("PMP files (*.pmp)|*.pmp|All files (*.*)|*.*"),
 		wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+	// Set default filter
+	dlg.SetFilterIndex(0);
 
 	if (dlg.ShowModal() == wxID_OK)
 	{