diff --git a/app/Services/Account/Activity/Activity/UpdateActivity.php b/app/Services/Account/Activity/Activity/UpdateActivity.php
index cda6b838f17..0ddc065d00f 100644
--- a/app/Services/Account/Activity/Activity/UpdateActivity.php
+++ b/app/Services/Account/Activity/Activity/UpdateActivity.php
@@ -88,7 +88,7 @@ public function execute(array $data): Activity
             'contacts' => $data['contacts'],
         ]);
 
-        return $activity;
+        return $activity->refresh();
     }
 
     /**
diff --git a/resources/js/components/people/activity/ActivityList.vue b/resources/js/components/people/activity/ActivityList.vue
index 64b11595a05..7377433a62e 100644
--- a/resources/js/components/people/activity/ActivityList.vue
+++ b/resources/js/components/people/activity/ActivityList.vue
@@ -122,7 +122,7 @@
                          :name="name"
                          :activity="activity"
                          :contact-id="contactId"
-                         @update="updateList($event)"
+                         @update="$set(activity, 'edit', false); updateList($event)"
                          @cancel="$set(activity, 'edit', false); displayLogActivity = false"
         />
       </div>
@@ -205,9 +205,9 @@ export default {
         });
     },
 
-    updateList: function (activity) {
+    updateList(activity) {
       this.displayLogActivity = false;
-      this.getActivities();
+      Vue.set(this.activities, this.activities.indexOf(this.activities.find(item => item.id === activity.id)), activity);
     },
 
     showDestroyActivity(activity) {
diff --git a/resources/js/components/people/activity/ActivityTypeList.vue b/resources/js/components/people/activity/ActivityTypeList.vue
index 0e0b8f90804..85e8ab021db 100644
--- a/resources/js/components/people/activity/ActivityTypeList.vue
+++ b/resources/js/components/people/activity/ActivityTypeList.vue
@@ -1,6 +1,7 @@
 <template>
   <form-select
     :id="'activity-type-list'"
+    v-model="choosenCategory"
     :title="title"
     :options="activityCategories"
     :iclass="'br2 f5 w-100 ba b--black-40 pa2 outline-0'"
@@ -11,6 +12,10 @@
 <script>
 export default {
   props: {
+    value: {
+      type: [String, Number],
+      default: '',
+    },
     title: {
       type: String,
       default: '',
@@ -19,21 +24,26 @@ export default {
 
   data() {
     return {
+      choosenCategory: '',
       activityCategories: null,
     };
   },
 
+  watch: {
+    value(val) {
+      this.choosenCategory = val;
+    },
+  },
+
   mounted() {
-    this.prepareComponent();
+    this.getActivities().then(() => {
+      this.choosenCategory = this.value;
+    });
   },
 
   methods: {
-    prepareComponent() {
-      this.getActivities();
-    },
-
     getActivities() {
-      axios.get('activityCategories')
+      return axios.get('activityCategories')
         .then(response => {
           this.activityCategories = Object.assign({}, _.map(response.data, a => {
             return {
diff --git a/resources/js/components/people/activity/CreateActivity.vue b/resources/js/components/people/activity/CreateActivity.vue
index e6ad2d48285..6ed8660b3ec 100644
--- a/resources/js/components/people/activity/CreateActivity.vue
+++ b/resources/js/components/people/activity/CreateActivity.vue
@@ -85,8 +85,8 @@
         <!-- ACTIVITY CATEGORIES -->
         <div v-if="displayCategory" class="bb b--gray-monica pb3 mb3">
           <activity-type-list
+            v-model="newActivity.activity_type_id"
             :title="$t('people.activities_add_pick_activity')"
-            @input="updateCategory($event)"
           />
         </div>
 
@@ -179,6 +179,7 @@ export default {
         contacts: [],
       },
       todayDate: '',
+      initialEmotions: [],
       participants: [],
       errors: [],
     };
@@ -249,10 +250,6 @@ export default {
       this.$emit('cancel');
     },
 
-    updateCategory(id) {
-      this.newActivity.activity_type_id = parseInt(id);
-    },
-
     store() {
       const method = this.activity ? 'put' : 'post';
       const url = this.activity ? 'api/activities/'+this.activity.id : 'api/activities';
diff --git a/tests/Api/ApiActivitiesTest.php b/tests/Api/ApiActivitiesTest.php
index 67b13d2cb86..a0fdcab1794 100644
--- a/tests/Api/ApiActivitiesTest.php
+++ b/tests/Api/ApiActivitiesTest.php
@@ -65,6 +65,38 @@ class ApiActivitiesTest extends ApiTestCase
         'updated_at',
     ];
 
+    protected $jsonActivityNoCategory = [
+        'id',
+        'object',
+        'summary',
+        'description',
+        'happened_at',
+        'attendees' => [
+            'total',
+            'contacts' => [
+                '*' => [
+                    'id',
+                    'object',
+                    'first_name',
+                    'last_name',
+                    'complete_name',
+                ],
+            ],
+        ],
+        'emotions' => [
+            '*' => [
+                'id',
+                'object',
+                'name',
+            ],
+        ],
+        'account' => [
+            'id',
+        ],
+        'created_at',
+        'updated_at',
+    ];
+
     /** @test */
     public function activities_get_all()
     {
@@ -315,6 +347,53 @@ public function activities_update()
             'happened_at' => '2018-05-01',
         ]);
 
+        $response->assertStatus(200);
+        $response->assertJsonStructure([
+            'data' => $this->jsonActivityNoCategory,
+        ]);
+        $activity_id = $response->json('data.id');
+        $this->assertEquals($activity->id, $activity_id);
+        $response->assertJsonFragment([
+            'object' => 'activity',
+            'id' => $activity_id,
+        ]);
+
+        $this->assertGreaterThan(0, $activity_id);
+        $this->assertDatabaseHas('activities', [
+            'account_id' => $user->account_id,
+            'id' => $activity_id,
+            'summary' => 'the activity',
+            'happened_at' => '2018-05-01',
+        ]);
+        $this->assertDatabaseHas('activity_contact', [
+            'account_id' => $user->account_id,
+            'contact_id' => $contact->id,
+            'activity_id' => $activity_id,
+        ]);
+    }
+
+    /** @test */
+    public function activities_update_category()
+    {
+        $user = $this->signin();
+        $contact = factory(Contact::class)->create([
+            'account_id' => $user->account_id,
+        ]);
+        $activity = factory(Activity::class)->create([
+            'account_id' => $user->account_id,
+        ]);
+        $activityType = factory(ActivityType::class)->create([
+            'account_id' => $user->account_id,
+        ]);
+
+        $response = $this->json('PUT', '/api/activities/'.$activity->id, [
+            'contacts' => [$contact->id],
+            'description' => 'the description',
+            'summary' => 'the activity',
+            'happened_at' => '2018-05-01',
+            'activity_type_id' => $activityType->id,
+        ]);
+
         $response->assertStatus(200);
         $response->assertJsonStructure([
             'data' => $this->jsonActivity,
@@ -326,12 +405,20 @@ public function activities_update()
             'id' => $activity_id,
         ]);
 
+        $activity_type_id = $response->json('data.activity_type.id');
+        $this->assertEquals($activityType->id, $activity_type_id);
+        $response->assertJsonFragment([
+            'object' => 'activityType',
+            'id' => $activity_type_id,
+        ]);
+
         $this->assertGreaterThan(0, $activity_id);
         $this->assertDatabaseHas('activities', [
             'account_id' => $user->account_id,
             'id' => $activity_id,
             'summary' => 'the activity',
             'happened_at' => '2018-05-01',
+            'activity_type_id' => $activityType->id,
         ]);
         $this->assertDatabaseHas('activity_contact', [
             'account_id' => $user->account_id,
@@ -379,7 +466,7 @@ public function activities_update_existing()
 
         $response->assertStatus(200);
         $response->assertJsonStructure([
-            'data' => $this->jsonActivity,
+            'data' => $this->jsonActivityNoCategory,
         ]);
         $activity_id = $response->json('data.id');
         $this->assertEquals($activity->id, $activity_id);