diff --git a/python/plugins/db_manager/dlg_export_vector.py b/python/plugins/db_manager/dlg_export_vector.py
index 4e6f03481ed..e7d59236ffe 100644
--- a/python/plugins/db_manager/dlg_export_vector.py
+++ b/python/plugins/db_manager/dlg_export_vector.py
@@ -79,6 +79,13 @@ class DlgExportVector(QDialog, Ui_Dialog):
         if filename == "":
             return
 
+        filterString = qgis.core.QgsVectorFileWriter.filterForDriver(selectedFilter)
+        ext = filterString[filterString.find('.'):]
+        ext = ext[:ext.find(' ')]
+
+        if not filename.lower().endswith(ext):
+            filename += ext
+
         # store the last used dir
         settings.setValue(self.lastUsedVectorDirSettingsKey, QFileInfo(filename).filePath())