diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index bf5dac7532..8644807c34 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1845,7 +1845,8 @@ class calendar_uiforms extends calendar_ui
 		}
 		if ($preserved['no_popup'])
 		{
-			$etpl->set_cell_attribute('button[cancel]','onclick','');
+			// If not a popup, load the normal calendar interface on cancel
+			$etpl->set_cell_attribute('button[cancel]','onclick','app.calendar.linkHandler(\'index.php?menuaction=calendar.calendar_uiviews.index\')');
 		}
 
 		// Allow admins to restore deleted events