diff --git a/src/components/TradingStatePanel/TradingStatePanel.js b/src/components/TradingStatePanel/TradingStatePanel.js
index a7d61330d..6fac2b5e1 100644
--- a/src/components/TradingStatePanel/TradingStatePanel.js
+++ b/src/components/TradingStatePanel/TradingStatePanel.js
@@ -181,12 +181,12 @@ const TradingStatePanel = ({
       className='hfui-tradingstatepanel__wrapper'
       moveable={moveable}
       removeable={removeable}
+      onRemove={onRemove}
     >
       <OutsideClickHandler
         onOutsideClick={() => isHistoryActive && setShowAOsHistory(false)}
       >
         <Panel
-          onRemove={onRemove}
           darkHeader
           moveable={false}
           removeable={false}
diff --git a/src/pages/MarketData/MarketData.js b/src/pages/MarketData/MarketData.js
index 33136650c..9c881c816 100644
--- a/src/pages/MarketData/MarketData.js
+++ b/src/pages/MarketData/MarketData.js
@@ -7,6 +7,8 @@ import './style.css'
 
 const commonComponentProps = {
   dark: true,
+  moveable: true,
+  removeable: true,
   darkHeader: true,
   showMarket: true,
   canChangeMarket: true,
@@ -22,6 +24,7 @@ const MarketData = () => {
           tradesProps={commonComponentProps}
           bookProps={commonComponentProps}
           chartProps={commonComponentProps}
+          sharedProps={commonComponentProps}
         />
       </Layout.Main>
       <Layout.Footer />
diff --git a/src/redux/reducers/ui/index.js b/src/redux/reducers/ui/index.js
index 44532c7d6..81811b774 100644
--- a/src/redux/reducers/ui/index.js
+++ b/src/redux/reducers/ui/index.js
@@ -438,8 +438,9 @@ function reducer(state = getInitialState(), action = {}) {
       const layoutDef = getActiveLayoutDef(state)
       const x = _min(_map(layoutDef.layout, l => l.x)) || 0
       const y = _max(_map(layoutDef.layout, l => l.y)) || 0
+      const lastLayoutItemHeight = _get(layoutDef, 'layout[-1].h', 0)
 
-      const newY = y + layoutDef.layout[layoutDef?.layout?.length - 1]?.h
+      const newY = y + lastLayoutItemHeight
 
       return {
         ...state,