diff --git a/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift b/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift
index 63140e6e..bfae5168 100644
--- a/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift
+++ b/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift
@@ -7,15 +7,12 @@
 //
 
 import UIKit
-
-
 open class ModalMoleculeListTemplate: MoleculeListTemplate {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
     
     public var closeButton: Button?
-        
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
@@ -23,8 +20,14 @@ open class ModalMoleculeListTemplate: MoleculeListTemplate {
     override open func handleNewData() {
         super.handleNewData()
         
-        closeButton = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: { _ in
-            MVMCoreNavigationHandler.shared()?.removeCurrentViewController()
+        closeButton = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: { [weak self] _ in
+            if let self = self {
+                guard let actionMap = self.loadObject?.pageJSON?.optionalDictionaryWithChainOfKeysOrIndexes([KeyButtonMap,"CloseButton"]) else {
+                   MVMCoreNavigationHandler.shared()?.removeCurrentViewController()
+                   return
+                }
+               MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: nil, delegateObject: self.delegateObjectIVar)
+            }
         })
     }