diff --git a/view/templates/event_head.tpl b/view/templates/event_head.tpl
index 81fcfc9e27..a96e5aff31 100644
--- a/view/templates/event_head.tpl
+++ b/view/templates/event_head.tpl
@@ -14,11 +14,11 @@
 	}
         
         function doEventPreview() {
-        $('#event-edit-preview').val(1);
-        $.post('events',$('#event-edit-form').serialize(), function(data) {
-                $.colorbox({ html: data });
-        });
-        $('#event-edit-preview').val(0);
+                $('#event-edit-preview').val(1);
+                $.post('events',$('#event-edit-form').serialize(), function(data) {
+                        $.colorbox({ html: data });
+                });
+                $('#event-edit-preview').val(0);
 	}
 
 	
diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js
index 5d61d5ae89..a14a034bc1 100644
--- a/view/theme/frost/js/theme.js
+++ b/view/theme/frost/js/theme.js
@@ -159,6 +159,11 @@ $(document).ready(function() {
 			eventClick: function(calEvent, jsEvent, view) {
 				showEvent(calEvent.id);
 			},
+                        loading: function(isLoading, view) {
+				if(!isLoading) {
+					$('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); });
+				}
+			},
 			
 			eventRender: function(event, element, view) {
 				//console.log(view.name);
@@ -353,6 +358,14 @@ function showEvent(eventid) {
 	);			
 }
 
+function doEventPreview() {
+        $('#event-edit-preview').val(1);
+        $.post('events',$('#event-edit-form').serialize(), function(data) {
+                $.colorbox({ html: data });
+        });
+        $('#event-edit-preview').val(0);
+}
+
 function initCrop() {
 	function onEndCrop( coords, dimensions ) {
 		$PR( 'x1' ).value = coords.x1;
diff --git a/view/theme/frost/templates/event_form.tpl b/view/theme/frost/templates/event_form.tpl
index f8e1d65605..f348512b45 100644
--- a/view/theme/frost/templates/event_form.tpl
+++ b/view/theme/frost/templates/event_form.tpl
@@ -5,11 +5,12 @@
 {{$desc}}
 </p>
 
-<form action="{{$post}}" method="post" >
+<form id="event-edit-form" action="{{$post}}" method="post" >
 
 <input type="hidden" name="event_id" value="{{$eid}}" />
 <input type="hidden" name="cid" value="{{$cid}}" />
 <input type="hidden" name="uri" value="{{$uri}}" />
+<input type="hidden" name="preview" id="event-edit-preview" value="0" />
 
 <div id="event-start-text">{{$s_text}}</div>
 {{$s_dsel}} {{$s_tsel}}
@@ -45,6 +46,7 @@
 {{$acl}}
 
 <div class="clear"></div>
+<input id="event-edit-preview" type="submit" name="preview" value="{{$preview|escape:'html'}}" onclick="doEventPreview(); return false;" />
 <input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
 </form>