diff --git a/krita/plugins/formats/heightmap/kis_heightmap_export.cpp b/krita/plugins/formats/heightmap/kis_heightmap_export.cpp
--- a/krita/plugins/formats/heightmap/kis_heightmap_export.cpp
+++ b/krita/plugins/formats/heightmap/kis_heightmap_export.cpp
@@ -114,7 +114,7 @@
 
     if (!m_chain->manager()->getBatchMode()) {
         if (kdb->exec() == QDialog::Rejected) {
-            return KisImportExportFilter::OK; // FIXME Cancel doesn't exist :(
+            return KisImportExportFilter::UserCancelled;
         }
     }
     else {
diff --git a/krita/plugins/formats/heightmap/kis_heightmap_import.cpp b/krita/plugins/formats/heightmap/kis_heightmap_import.cpp
--- a/krita/plugins/formats/heightmap/kis_heightmap_import.cpp
+++ b/krita/plugins/formats/heightmap/kis_heightmap_import.cpp
@@ -144,7 +144,7 @@
 
     if (!m_chain->manager()->getBatchMode()) {
         if (kdb->exec() == QDialog::Rejected) {
-            return KisImportExportFilter::OK; // FIXME Cancel doesn't exist :(
+            return KisImportExportFilter::UserCancelled;
         }
     }
 
diff --git a/krita/plugins/formats/jp2/jp2_export.cc b/krita/plugins/formats/jp2/jp2_export.cc
--- a/krita/plugins/formats/jp2/jp2_export.cc
+++ b/krita/plugins/formats/jp2/jp2_export.cc
@@ -92,7 +92,7 @@
 
     if (!m_chain->manager()->getBatchMode()) {
         if (kdb->exec() == QDialog::Rejected) {
-            return KisImportExportFilter::OK; // FIXME Cancel doesn't exist :(
+            return KisImportExportFilter::UserCancelled;
         }
     }
     else {
diff --git a/krita/plugins/formats/jpeg/kis_jpeg_export.cc b/krita/plugins/formats/jpeg/kis_jpeg_export.cc
--- a/krita/plugins/formats/jpeg/kis_jpeg_export.cc
+++ b/krita/plugins/formats/jpeg/kis_jpeg_export.cc
@@ -130,7 +130,7 @@
 
     if (!m_chain->manager()->getBatchMode()) {
         if (kdb->exec() == QDialog::Rejected) {
-            return KisImportExportFilter::OK; // FIXME Cancel doesn't exist :(
+            return KisImportExportFilter::UserCancelled;
         }
     }
     else {
diff --git a/krita/plugins/formats/png/kis_png_export.cc b/krita/plugins/formats/png/kis_png_export.cc
--- a/krita/plugins/formats/png/kis_png_export.cc
+++ b/krita/plugins/formats/png/kis_png_export.cc
@@ -90,6 +90,7 @@
     KDialog* kdb = new KDialog(0);
     kdb->setCaption(i18n("PNG Export Options"));
     kdb->setModal(false);
+    kdb->setButtons(KDialog::Ok | KDialog::Cancel);
 
     KisImageWSP image = input->image();
     qApp->processEvents(); // For vector layers to be updated
@@ -173,7 +174,7 @@
         if (hasVisibleWidgets()) {
             if (!m_chain->manager()->getBatchMode()) {
                 if (kdb->exec() == QDialog::Rejected) {
-                    return KisImportExportFilter::OK; // FIXME Cancel doesn't exist :(
+                    return KisImportExportFilter::UserCancelled;
                 }
             }
         }
diff --git a/krita/plugins/formats/ppm/kis_ppm_export.cpp b/krita/plugins/formats/ppm/kis_ppm_export.cpp
--- a/krita/plugins/formats/ppm/kis_ppm_export.cpp
+++ b/krita/plugins/formats/ppm/kis_ppm_export.cpp
@@ -172,7 +172,7 @@
 
     if (!m_chain->manager()->getBatchMode()) {
         if (kdb->exec() == QDialog::Rejected) {
-            return KisImportExportFilter::OK; // FIXME Cancel doesn't exist :(
+            return KisImportExportFilter::UserCancelled;
         }
     }
     else {