diff --git a/ChangeLog b/ChangeLog
index 71e2d8ae68..3a611c08f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog
 - issue #17553 Fix Metro theme login form with
 - issue #16042 Exported gzip file of database has first ~73 kB uncompressed and rest is gzip compressed in Firefox
 - issue #17705 Fix inline SQL query edit FK checkbox preventing submit buttons from working
+- issue #17777 Fix Uncaught TypeError: Cannot read properties of null (reading 'inline') on datepickers when re-opened
 
 5.2.0 (2022-05-10)
 - issue #16521 Upgrade Bootstrap to version 5
diff --git a/js/src/makegrid.js b/js/src/makegrid.js
index 26a1c8c894..4e2f5e681e 100644
--- a/js/src/makegrid.js
+++ b/js/src/makegrid.js
@@ -759,7 +759,8 @@ window.makeGrid = function (t, enableResize, enableReorder, enableVisib, enableG
             if ($dp.length > 0) {
                 // eslint-disable-next-line no-underscore-dangle
                 $(document).on('mousedown', $.datepicker._checkExternalClick);
-                $dp.datepicker('destroy');
+                $dp.datepicker('refresh');
+
                 // change the cursor in edit box back to normal
                 // (the cursor become a hand pointer when we add datepicker)
                 $(g.cEdit).find('.edit_box').css('cursor', 'inherit');