diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py
index 856d9e9bc91..0be54df9f56 100644
--- a/addons/caldav/wizard/calendar_event_export.py
+++ b/addons/caldav/wizard/calendar_event_export.py
@@ -32,16 +32,6 @@ class calendar_event_export(osv.osv_memory):
     """
     Export Calendar Event.
     """
-    def process_export_ics(self, cr, uid, ids, context):
-        """
-        Get Default value for file_path field.
-        """
-        model = context.get('model', 'basic.calendar')
-        model_obj = self.pool.get(model)
-
-        calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
-        self.write(cr, uid, ids, {'file_path': base64.encodestring(calendar)})
-        return False
 
     def default_get(self, cr, uid, fields, context):
         """
@@ -54,6 +44,9 @@ class calendar_event_export(osv.osv_memory):
         name = 'OpenERP %s.ics' % (model_obj._description)
         if 'name' in fields:
             res.update({'name': name})
+        if 'file_path' in fields:
+            calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
+            res.update({'file_path': base64.encodestring(calendar)})
         return  res
 
     _name = "calendar.event.export"
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
index 227822966d0..cfadf945bf4 100644
--- a/addons/caldav/wizard/calendar_event_export_view.xml
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -13,8 +13,8 @@
                     </group>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button name="process_export_ics"  icon="gtk-execute" string="Genetate ics" type="object"/>
-                    	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    	<label string=""/>
+                    	<button  icon="gtk-close" special="cancel" string="_Close"/>
                    </group>
                </form>
             </field>