1 files changed, 7 insertions, 1 deletions

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index fb3be13c0..affc1a0a2 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -5,6 +5,7 @@ import { inject, observer } from 'mobx-react';
 import AppStore from '../../stores/AppStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
+import FeaturesStore from '../../stores/FeaturesStore';
 import UIStore from '../../stores/UIStore';
 import NewsStore from '../../stores/NewsStore';
 import SettingsStore from '../../stores/SettingsStore';
@@ -25,6 +26,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
   render() {
     const {
       app,
+      features,
       services,
       ui,
       news,
@@ -63,10 +65,13 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
 
     const { children } = this.props;
 
+    const isLoadingFeatures = features.featuresRequest.isExecuting
+      && !features.featuresRequest.wasExecuted;
+
     const isLoadingServices = services.allServicesRequest.isExecuting
       && services.allServicesRequest.isExecutingFirstTime;
 
-    if (isLoadingServices) {
+    if (isLoadingFeatures || isLoadingServices) {
       return (
         <AppLoader />
       );
@@ -131,6 +136,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
 AppLayoutContainer.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     services: PropTypes.instanceOf(ServicesStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
     recipes: PropTypes.instanceOf(RecipesStore).isRequired,
     app: PropTypes.instanceOf(AppStore).isRequired,
     ui: PropTypes.instanceOf(UIStore).isRequired,