diff --git a/docs/en_US/release_notes_9_5.rst b/docs/en_US/release_notes_9_5.rst
index abd66d41f..ea6c20eb7 100644
--- a/docs/en_US/release_notes_9_5.rst
+++ b/docs/en_US/release_notes_9_5.rst
@@ -35,4 +35,5 @@ Bug fixes
   | `Issue #7466 <https://github.com/pgadmin-org/pgadmin4/issues/7466>`_ -  Fixed an issue where utilities such as pg_dump and pg_restore failed to log error messages when required dependency files were missing.
   | `Issue #8032 <https://github.com/pgadmin-org/pgadmin4/issues/8032>`_ -  Fixed an issue where the Schema Diff Tool incorrectly reported differences due to variations in the order of the privileges.
   | `Issue #8691 <https://github.com/pgadmin-org/pgadmin4/issues/8691>`_ -  Fixed an issue in the query tool where using multiple cursors to copy text resulted in only the first line being copied.
+  | `Issue #8808 <https://github.com/pgadmin-org/pgadmin4/issues/8808>`_ -  Fixed an issue where data export using a query opened the wrong dialog type.
   | `Issue #8809 <https://github.com/pgadmin-org/pgadmin4/issues/8809>`_ -  Fixed an issue where data export using a query failed when the query contained a newline character.
diff --git a/web/pgadmin/tools/import_export/static/js/import_export.ui.js b/web/pgadmin/tools/import_export/static/js/import_export.ui.js
index 1d818e39d..65ce0b4d1 100644
--- a/web/pgadmin/tools/import_export/static/js/import_export.ui.js
+++ b/web/pgadmin/tools/import_export/static/js/import_export.ui.js
@@ -78,7 +78,7 @@ export default class ImportExportSchema extends BaseUISchema {
           return {
             type: 'file',
             controlProps: {
-              dialogType: state.is_import ? 'select_file' : 'create_file',
+              dialogType: state.is_import && !state?.is_query_export ? 'select_file' : 'create_file',
               supportedTypes: ['csv', 'text','bin', '*'],
               dialogTitle: 'Select file',
             }