diff -ur SOGo-4.0.4.orig/UI/WebServerResources/js/Scheduler/Calendar.service.js SOGo-4.0.4/UI/WebServerResources/js/Scheduler/Calendar.service.js
--- SOGo-4.0.4.orig/UI/WebServerResources/js/Scheduler/Calendar.service.js	2018-10-23 21:22:36.000000000 +0200
+++ SOGo-4.0.4/UI/WebServerResources/js/Scheduler/Calendar.service.js	2019-01-16 09:23:35.165297026 +0100
@@ -33,6 +33,7 @@
       $Component: Component,
       $$Acl: Acl,
       activeUser: Settings.activeUser(),
+      $selectedCalendar: 'personal',
       $view: null
     });
 
@@ -72,6 +73,13 @@
       });
       if (calendar)
         return calendar.id;
+    }
+    else if (defaultCalendar == 'selected') {
+      calendar = _.find(Calendar.$findAll(null, true), function(calendar) {
+        return calendar.id == Calendar.$selectedCalendar;
+      });
+      if (calendar)
+        return calendar.id;
     }
 
     return 'personal';
diff -ur SOGo-4.0.4.orig/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js SOGo-4.0.4/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
--- SOGo-4.0.4.orig/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js	2018-10-23 21:22:36.000000000 +0200
+++ SOGo-4.0.4/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js	2019-01-16 09:23:23.953296546 +0100
@@ -20,6 +20,7 @@
         '           ng-false-value="0"',
         '           aria-label="' + l('Enable') + '"></md-switch>',
         '<p class="sg-item-name"',
+        '   ng-click="$ctrl.selectCalendar()"',
         '   ng-dblclick="$ctrl.editFolder($event)">',
         '  <span ng-bind="$ctrl.calendar.name"></span>',
         '  <md-icon ng-if="$ctrl.calendar.$error" class="md-warn">error</md-icon>',
@@ -136,6 +137,9 @@
       this.inputElement.value = this.calendar.name;
     };
 
+    this.selectCalendar = function() {
+      Calendar.$selectedCalendar = this.calendar.id;
+    };
 
     this.confirmDelete = function() {
       if (this.calendar.isSubscription) {