2 files changed, 28 insertions, 2 deletions

diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 7b76553b2..583c7184c 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -119,10 +119,27 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
 
   // Get currently shown services
   services() {
-    let services = this.props.stores.services.allDisplayed;
+    let services = [];
     if (this.state.search) {
-      // Apply simple search algorythm
+      // Apply simple search algorythm to list of all services
+      services = this.props.stores.services.allDisplayed;
       services = services.filter(service => service.name.toLowerCase().includes(this.state.search.toLowerCase()));
+    } else {
+      // Add last used services to services array
+      for (const service of this.props.stores.services.lastUsedServices) {
+        if (this.props.stores.services.one(service)) {
+          services.push(
+            this.props.stores.services.one(service),
+          );
+        }
+      }
+
+      // Add all other services in the default order
+      for (const service of this.props.stores.services.allDisplayed) {
+        if (!services.includes(service)) {
+          services.push(service);
+        }
+      }
     }
 
     return services;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 076ecc204..6120ae023 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -34,6 +34,11 @@ export default class ServicesStore extends Store {
 
   @observable filterNeedle = null;
 
+  // Array of service IDs that have recently been used
+  // [0] => Most recent, [n] => Least recent
+  // No service ID should be in the list multiple times, not all service IDs have to be in the list
+  @observable lastUsedServices = [];
+
   constructor(...args) {
     super(...args);
 
@@ -325,6 +330,10 @@ export default class ServicesStore extends Store {
     });
     service.isActive = true;
 
+    // Update list of last used services
+    this.lastUsedServices = this.lastUsedServices.filter(id => id !== serviceId);
+    this.lastUsedServices.unshift(serviceId);
+
     this._focusActiveService();
   }