2 files changed, 8 insertions, 0 deletions

diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 8fe576813..dcda021c1 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -14,6 +14,7 @@ import serviceProxy from '../features/serviceProxy';
 import basicAuth from '../features/basicAuth';
 import workspaces from '../features/workspaces';
 import shareFranz from '../features/shareFranz';
+import announcements from '../features/announcements';
 
 import { DEFAULT_FEATURES_CONFIG } from '../config';
 
@@ -71,5 +72,6 @@ export default class FeaturesStore extends Store {
     basicAuth(this.stores, this.actions);
     workspaces(this.stores, this.actions);
     shareFranz(this.stores, this.actions);
+    announcements(this.stores, this.actions);
   }
 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 0ec6bf550..d04fdd0c5 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -36,6 +36,7 @@ export default class ServicesStore extends Store {
 
     // Register action handlers
     this.actions.service.setActive.listen(this._setActive.bind(this));
+    this.actions.service.blurActive.listen(this._blurActive.bind(this));
     this.actions.service.setActiveNext.listen(this._setActiveNext.bind(this));
     this.actions.service.setActivePrev.listen(this._setActivePrev.bind(this));
     this.actions.service.showAddServiceInterface.listen(this._showAddServiceInterface.bind(this));
@@ -301,6 +302,11 @@ export default class ServicesStore extends Store {
     this._focusActiveService();
   }
 
+  @action _blurActive() {
+    if (!this.active) return;
+    this.active.isActive = false;
+  }
+
   @action _setActiveNext() {
     const nextIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), 1, this.allDisplayed.length);