From f03d7e903e27e2bee767bdb2e58f896130f5905d Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Fri, 1 Mar 2019 17:10:10 +0100
Subject: [PATCH] FIX theming bug

---
 lib/ui/src/core/layout.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ui/src/core/layout.js b/lib/ui/src/core/layout.js
index 9cc120595464..d6bf8ef8ce9f 100644
--- a/lib/ui/src/core/layout.js
+++ b/lib/ui/src/core/layout.js
@@ -160,7 +160,7 @@ export default function({ store }) {
   };
 
   const fromState = pick(store.getState(), 'layout', 'ui', 'selectedPanel');
-  const fromRestore = pick(store.getInitialState(), 'layout', 'ui', 'selectedPanel');
+
   const initial = {
     ui: {
       enableShortcuts: true,
@@ -177,7 +177,7 @@ export default function({ store }) {
     },
   };
 
-  const state = merge({}, fromRestore, fromState, initial);
+  const state = merge(fromState, initial);
 
   return { api, state };
 }