diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 92ffb0d50f..06deef89e8 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1537,7 +1537,7 @@ class calendar_uiforms extends calendar_ui
'no_popup' => isset($_GET['no_popup']),
'template' => isset($_GET['template']) ? $_GET['template'] : (isset($_REQUEST['print']) ? 'calendar.print' : 'calendar.edit'),
);
- if($preserv['template'] && $this->cal_prefs['new_event_dialog'] == 'edit')
+ if(!isset($_REQUEST['print']) && !empty($preserv['template']) && $this->cal_prefs['new_event_dialog'] == 'edit')
{
// User wants full thing
unset($preserv['template']);
diff --git a/calendar/templates/default/print.xet b/calendar/templates/default/print.xet
index 8cb5c012eb..e73beed01b 100644
--- a/calendar/templates/default/print.xet
+++ b/calendar/templates/default/print.xet
@@ -30,9 +30,7 @@
-
-
-
+