diff --git a/app/Http/Controllers/Api/EventsController.php b/app/Http/Controllers/Api/EventsController.php
index 4eb5eea..7f2acfb 100644
--- a/app/Http/Controllers/Api/EventsController.php
+++ b/app/Http/Controllers/Api/EventsController.php
@@ -28,6 +28,7 @@ class EventsController extends Controller
             ->collection($events)
             ->transformWith(function ($event) {
                 $isOwnEvent = $event->user_id == auth()->id();
+                $editable = request('action') == 'edit' ? true : false;
 
                 return [
                     'id'         => $event->id,
@@ -39,7 +40,7 @@ class EventsController extends Controller
                     'start'      => $event->start,
                     'end'        => $event->end,
                     'allDay'     => $event->is_allday,
-                    'editable'   => true,
+                    'editable'   => $editable,
                     'color'      => $isOwnEvent ? '' : '#B7B7B7',
                 ];
             })
diff --git a/resources/lang/de/event.php b/resources/lang/de/event.php
index c2a1eb5..52bcd1d 100644
--- a/resources/lang/de/event.php
+++ b/resources/lang/de/event.php
@@ -2,6 +2,7 @@
 
 return [
     'created'     => 'Event created.',
+    'edit'        => 'Edit Events',
     'updated'     => 'Event updated.',
     'deleted'     => 'Event deleted.',
     'rescheduled' => 'Event has been rescheduled.',
diff --git a/resources/lang/en/event.php b/resources/lang/en/event.php
index c2a1eb5..52bcd1d 100644
--- a/resources/lang/en/event.php
+++ b/resources/lang/en/event.php
@@ -2,6 +2,7 @@
 
 return [
     'created'     => 'Event created.',
+    'edit'        => 'Edit Events',
     'updated'     => 'Event updated.',
     'deleted'     => 'Event deleted.',
     'rescheduled' => 'Event has been rescheduled.',
diff --git a/resources/lang/id/event.php b/resources/lang/id/event.php
index 8541e47..2d69554 100644
--- a/resources/lang/id/event.php
+++ b/resources/lang/id/event.php
@@ -2,6 +2,7 @@
 
 return [
     'created'     => 'Event berhasil diinput.',
+    'edit'        => 'Edit Event',
     'updated'     => 'Event berhasil diupdate.',
     'deleted'     => 'Event berhasil dihapus.',
     'rescheduled' => 'Jadwal event berhasil diubah.',
diff --git a/resources/views/users/calendar.blade.php b/resources/views/users/calendar.blade.php
index feb4df2..83a738a 100644
--- a/resources/views/users/calendar.blade.php
+++ b/resources/views/users/calendar.blade.php
@@ -4,14 +4,23 @@
 
 @section('content')
 
-<div class="">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="x_panel">
-                <div class="x_title"><h3>User Calendar <small>Click to add/edit events</small></h3></div>
-                <div class="x_content">
-                    <div id='calendar'></div>
+<div class="row">
+    <div class="col-md-12">
+        <div class="x_panel">
+            <div class="x_title">
+                <div class="pull-right">
+                    @if (request('action') == 'edit')
+                        {{ link_to_route('users.calendar', __('app.done'), [], ['class' => 'btn btn-default btn-xs']) }}
+                    @else
+                        {{ link_to_route('users.calendar', __('event.edit'), ['action' => 'edit'], ['class' => 'btn btn-warning btn-xs']) }}
+                    @endif
                 </div>
+                <h3>
+                    User Calendar <small>Click to add/edit events</small>
+                </h3>
+            </div>
+            <div class="x_content">
+                <div id='calendar'></div>
             </div>
         </div>
     </div>
@@ -147,6 +156,7 @@
         y = date.getFullYear(),
         started,
         categoryClass;
+        var selectable = "{{ request('action') }}" == 'edit';
 
         var calendar = $('#calendar').fullCalendar({
             header: {
@@ -156,7 +166,7 @@
             },
             defaultView: 'agendaWeek',
             height: 550,
-            selectable: true,
+            selectable: selectable,
             selectHelper: true,
             minTime: '06:00:00',
             // eventLimit: true,
@@ -165,7 +175,7 @@
             slotLabelFormat: 'HH:mm',
             slotDuration: '01:00:00',
             events: {
-                url: "{{ route('api.events.index') }}",
+                url: "{{ route('api.events.index', request(['action'])) }}",
                 type: "GET",
                 error: function() {
                     alert('there was an error while fetching events!');