From e0d902d27927eb4d929968c65e06c82dcfd1114d Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 9 Dec 2020 15:58:34 +0000
Subject: [PATCH] Fix merge bug

---
 packages/builder/src/builderStore/store/frontend.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index e857689eba..c4d9ed6503 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -88,7 +88,7 @@ export const getFrontendStore = () => {
           const screen = get(allScreens).find(screen => screen._id === screenId)
           if (!screen) return state
           state.currentFrontEndType = FrontendTypes.SCREEN
-          state.currentAssetId = selectedScreen._id
+          state.currentAssetId = screen._id
           state.currentView = "detail"
           state.selectedComponentId = screen.props?._id
           return state