diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52dba5c3a5..47073c33ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 ### Fixed
 
 - Fixed the `Anomaly and malware detection` link. [#5329](https://github.com/wazuh/wazuh-kibana-app/pull/5329)
+- Fixed the problem that did not allow closing the time picker when the button was clicked again in `Agents` and `Management/Statistics`. [#5341](https://github.com/wazuh/wazuh-kibana-app/pull/5341)
 
 ## Wazuh v4.4.0 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 06
 
diff --git a/public/components/wz-date-picker/components/condensed.tsx b/public/components/wz-date-picker/components/condensed.tsx
index 8f4f7f4246..2f862b90f9 100644
--- a/public/components/wz-date-picker/components/condensed.tsx
+++ b/public/components/wz-date-picker/components/condensed.tsx
@@ -48,8 +48,8 @@ export function CondensedPicker({ ranges, onTimeChange }) {
     return result;
   }
 
-  const button = (<EuiButtonEmpty 
-    onClick={() => setIsOpen(true)}
+  const button = (<EuiButtonEmpty
+    onClick={() => setIsOpen(!isOpen)}
     iconType="arrowDown"
     iconSide="right">
     {!!customRange
@@ -78,4 +78,4 @@ export function CondensedPicker({ ranges, onTimeChange }) {
     </EuiPopover>
   )
 
-}
\ No newline at end of file
+}