diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index 4fc2689ab4e..60fbfb9c7e2 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -62,13 +62,16 @@
       var notification = action.notification ?
             action.notification : {};
       var messages = action.messages;
-      var messageArgs = { name: $detailView.find('tr.name td.value').html() };
       var id = args.id;
       var context = $detailView.data('view-args').context;
       var _custom = $detailView.data('_custom');
       var customAction = action.action.custom;
       var noAdd = action.noAdd;
       var noRefresh = additional.noRefresh;
+      var messageArgs = {
+        name: $detailView.find('tr.name td.value').html(),
+        context: context
+      };
 
       // Handle pre-action (occurs before any other behavior happens)
       if (preAction) {
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 5281785b1a2..f7f7457dd14 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -23,7 +23,6 @@
       var listViewArgs = $instanceRow.closest('div.list-view').data('view-args');
       var notification = args.action.notification ? args.action.notification : {};
       var messages = args.action ? args.action.messages : {};
-      var messageArgs = { name: $instanceRow.find('td.name span').html() };
       var preAction = args.action ? args.action.preAction : {};
       var action = args.action ? args.action.action : {};
       var section;
@@ -32,6 +31,9 @@
         jsonObj: $instanceRow.data('jsonObj')
       };
       var $listView = $instanceRow.closest('.list-view');
+      var messageArgs = {
+        name: $instanceRow.find('td.name span').html()
+      };
 
       if (args.data) $.extend(true, data, args.data);
       if (listViewArgs) section = listViewArgs.section;
@@ -269,14 +271,17 @@
       };
 
       var context = $.extend({}, listViewArgs.context);
+      
       context[
         listViewArgs.activeSection
       ] = [$instanceRow.data('jsonObj')];
 
+      messageArgs.context = context;     
+
       if (!args.action.action.externalLink &&
           !args.action.createForm &&
           args.action.addRow != 'true' &&
-          !action.custom && !action.uiCustom)
+          !action.custom && !action.uiCustom) {
         cloudStack.dialog.confirm({
           message: messages.confirm(messageArgs),
           action: function() {
@@ -287,9 +292,9 @@
             });
           }
         });
-      else if (action.custom || action.uiCustom)
+      } else if (action.custom || action.uiCustom) {
         performAction();
-      else {
+      } else {
         var addRow = args.action.addRow == "false" ? false : true;
         var isHeader = args.action.isHeader;
         var createFormContext = $.extend({}, context);