1 files changed, 10 insertions, 5 deletions

diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 02a349dee..cc2775178 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -140,12 +140,17 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
       services = this.props.stores.services.allDisplayed;
       services = services.filter(service => service.name.toLowerCase().search(this.state.search.toLowerCase()) !== -1);
     } else {
+      // Add the currently active service first
+      const currentService = this.props.stores.services.active;
+      if (currentService) {
+        services.push(currentService);
+      }
+
       // 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),
-          );
+        const tempService = this.props.stores.services.one(service);
+        if (tempService && !services.includes(tempService)) {
+          services.push(tempService);
         }
       }
 
@@ -167,6 +172,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
 
     // Reset and close modal
     this.setState({
+      selected: 0,
       search: '',
     });
     this.close();
@@ -192,7 +198,6 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
         serviceElement.scrollIntoViewIfNeeded(false);
       }
 
-
       return {
         selected: newSelected,
       };