diff --git a/packages/noodl-viewer-react/src/api/navigation.js b/packages/noodl-viewer-react/src/api/navigation.js
index 7612aee..22f3675 100644
--- a/packages/noodl-viewer-react/src/api/navigation.js
+++ b/packages/noodl-viewer-react/src/api/navigation.js
@@ -5,9 +5,14 @@ const navigation = {
   async showPopup(componentPath, params) {
     return new Promise((resolve) => {
       navigation._noodlRuntime.context.showPopup(componentPath, params, {
+        senderNode: this.nodeScope.componentOwner,
+        /**
+         * @param {string | undefined} action
+         * @param {*} results
+         */
         onClosePopup: (action, results) => {
           resolve({
-            action: action.replace('closeAction-', ''),
+            action: (action || '').replace('closeAction-', ''),
             parameters: results
           });
         }