diff --git a/docs/en_US/release_notes_4_2.rst b/docs/en_US/release_notes_4_2.rst
index 0f8e44f18..8a51d9ef7 100644
--- a/docs/en_US/release_notes_4_2.rst
+++ b/docs/en_US/release_notes_4_2.rst
@@ -23,6 +23,7 @@ Bug fixes
 | `Bug #3811 <https://redmine.postgresql.org/issues/3811>`_ - Ensure that Backup/Restore button should work on single click.
 | `Bug #3837 <https://redmine.postgresql.org/issues/3837>`_ - Fixed SQL for when clause while creating Trigger.
 | `Bug #3838 <https://redmine.postgresql.org/issues/3838>`_ - Proper SQL should be generated when creating/changing column with custom type argument.
+| `Bug #3840 <https://redmine.postgresql.org/issues/3840>`_ - Ensure that file format combo box value should not retained when hidden files checkbox is toggled.
 | `Bug #3846 <https://redmine.postgresql.org/issues/3846>`_ - Proper SQL should be generated when create procedure with custom type arguments.
 | `Bug #3891 <https://redmine.postgresql.org/issues/3891>`_ - Correct order of Save and Cancel button for json/jsonb editing.
 | `Bug #3897 <https://redmine.postgresql.org/issues/3897>`_ - Data should be updated properly for FTS Configurations, FTS Dictionaries, FTS Parsers and FTS Templates.
\ No newline at end of file
diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js
index c714f154a..93891fc7c 100644
--- a/web/pgadmin/misc/file_manager/static/js/utility.js
+++ b/web/pgadmin/misc/file_manager/static/js/utility.js
@@ -1176,11 +1176,11 @@ define([
           };
 
           if (cb.checked) {
-            $('div.allowed_file_types select').val('*').trigger('change');
+            $('div.allowed_file_types select').trigger('change');
             data['is_checked'] = true;
           } else {
             // User wants to hide it again
-            $('div.allowed_file_types select').prop('selectedIndex', 0).trigger('change');
+            $('div.allowed_file_types select').trigger('change');
             data['is_checked'] = false;
           }
           // Save it in preference