diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 535a8d977..4f9f82225 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+unreleased
+==========
+
+* Ensure action buttons in directory listing do not get disabled after using
+  cancel or back button if files or folders are selected.
+
 3.0.1 (2023-07-13)
 ==================
 
diff --git a/filer/static/filer/js/base.js b/filer/static/filer/js/base.js
index db6de7780..72ce33ceb 100644
--- a/filer/static/filer/js/base.js
+++ b/filer/static/filer/js/base.js
@@ -91,6 +91,12 @@ Cl.mediator = new Mediator();
 
             // timeout is needed to wait until table row has class selected.
             setTimeout(function () {
+                // Set classes for checked items
+                actionSelect.each(function (no, el) {
+                    if (el.checked) {
+                        el.closest('.list-item').classList.add('selected');
+                    }
+                });
                 if (navigatorTable.hasClass('selected')) {
                     actionList.addClass('action-selected');
                 }