diff --git a/src/components/BacktestOptionsPanel/BacktestOptionsPanel.js b/src/components/BacktestOptionsPanel/BacktestOptionsPanel.js
index eb0dfa629..f3408f059 100644
--- a/src/components/BacktestOptionsPanel/BacktestOptionsPanel.js
+++ b/src/components/BacktestOptionsPanel/BacktestOptionsPanel.js
@@ -3,20 +3,25 @@ import { useTranslation } from 'react-i18next'
 import PropTypes from 'prop-types'
 import _toUpper from 'lodash/toUpper'
 import { Icon } from 'react-fa'
+import { useDispatch, useSelector } from 'react-redux'
 import BacktestOptionsNewTest from './tabs/NewTest'
 import HistoryButton from '../../ui/HistoryButton/HistoryButton'
 import BacktestHistoryList from './tabs/BacktestHistoryList'
 import PanelButton from '../../ui/Panel/Panel.Button'
 import BacktestDetails from './tabs/BacktestDetails'
-import { BACKTEST_TAB_SECTIONS } from '../StrategyEditor/tabs/BacktestTab'
+import { BACKTEST_TAB_SECTIONS } from '../../redux/reducers/ui'
+import UIActions from '../../redux/actions/ui'
+import WSActions from '../../redux/actions/ws'
+import { getBacktestActiveSection } from '../../redux/selectors/ui'
 
 import './style.css'
 
 const BacktestOptionsPanel = (props) => {
-  const { setActiveSection, activeSection, setBtHistoryId } = props
-
   const { t } = useTranslation()
+  const dispatch = useDispatch()
+  const activeSection = useSelector(getBacktestActiveSection)
 
+  const setActiveSection = (section) => dispatch(UIActions.setBacktestActiveSection(section))
   const onNewTestTabClick = () => setActiveSection(BACKTEST_TAB_SECTIONS.NEW_BT)
   const onHistoryTabClick = () => {
     if (activeSection !== BACKTEST_TAB_SECTIONS.NEW_BT) {
@@ -27,7 +32,7 @@ const BacktestOptionsPanel = (props) => {
   const onBackButtonClick = () => setActiveSection(BACKTEST_TAB_SECTIONS.HISTORY_BT_LIST)
 
   const onBacktestRowClick = ({ rowData }) => {
-    setBtHistoryId(rowData.executionId)
+    dispatch(WSActions.setHistoryBacktestId(rowData.executionId))
     setActiveSection(BACKTEST_TAB_SECTIONS.HISTORY_BT_DETAILS)
   }
 
@@ -63,16 +68,10 @@ const BacktestOptionsPanel = (props) => {
         <BacktestHistoryList onBacktestRowClick={onBacktestRowClick} />
       )}
       {activeSection === BACKTEST_TAB_SECTIONS.HISTORY_BT_DETAILS && (
-        <BacktestDetails {...props} />
+        <BacktestDetails />
       )}
     </div>
   )
 }
 
-BacktestOptionsPanel.propTypes = {
-  activeSection: PropTypes.string.isRequired,
-  setActiveSection: PropTypes.func.isRequired,
-  setBtHistoryId: PropTypes.func.isRequired,
-}
-
 export default BacktestOptionsPanel
diff --git a/src/components/BacktestOptionsPanel/BacktestResultsOptionsPanel.js b/src/components/BacktestOptionsPanel/BacktestResultsOptionsPanel.js
index fc98906e0..1d290f4c1 100644
--- a/src/components/BacktestOptionsPanel/BacktestResultsOptionsPanel.js
+++ b/src/components/BacktestOptionsPanel/BacktestResultsOptionsPanel.js
@@ -1,27 +1,32 @@
 import React from 'react'
 import _toUpper from 'lodash/toUpper'
+import _get from 'lodash/get'
 import PropTypes from 'prop-types'
 import { useTranslation } from 'react-i18next'
 import { useDispatch, useSelector } from 'react-redux'
 import { Icon } from 'react-fa'
 import Button from '../../ui/Button'
-import { getFormatTimeFn } from '../../redux/selectors/ui'
+import {
+  getBacktestActiveSection,
+  getFormatTimeFn,
+} from '../../redux/selectors/ui'
 import { renderDate } from '../../util/ui'
 import PanelButton from '../../ui/Panel/Panel.Button'
-import { BACKTEST_TAB_SECTIONS } from '../StrategyEditor/tabs/BacktestTab'
+
+import UIActions from '../../redux/actions/ui'
 import WSActions from '../../redux/actions/ws'
+import { BACKTEST_TAB_SECTIONS } from '../../redux/reducers/ui'
+import { getCurrentHistoryBacktest } from '../../redux/selectors/ws'
 
-const BacktestResultsOptionsPanel = ({
-  showFullscreenChart,
-  backtestTimestamp,
-  activeSection,
-  setActiveSection,
-}) => {
+const BacktestResultsOptionsPanel = ({ showFullscreenChart }) => {
   const formatTime = useSelector(getFormatTimeFn)
+  const backtest = useSelector(getCurrentHistoryBacktest)
+  const activeSection = useSelector(getBacktestActiveSection)
 
   const { t } = useTranslation()
   const dispatch = useDispatch()
 
+  const setActiveSection = (section) => dispatch(UIActions.setBacktestActiveSection(section))
   const onBackButtonClick = () => setActiveSection(BACKTEST_TAB_SECTIONS.HISTORY_BT_DETAILS)
   const onNewTestButtonClick = () => {
     dispatch(WSActions.purgeBacktestData())
@@ -43,7 +48,9 @@ const BacktestResultsOptionsPanel = ({
           <p>
             {t('strategyEditor.backtestHistoryResults')}
             &nbsp;
-            <b>{renderDate(backtestTimestamp, formatTime, false)}</b>
+            <b>
+              {renderDate(_get(backtest, 'timestamp', 0), formatTime, false)}
+            </b>
           </p>
           <Button
             className='hfui-strategy-options__option-btn'
@@ -76,13 +83,6 @@ const BacktestResultsOptionsPanel = ({
 
 BacktestResultsOptionsPanel.propTypes = {
   showFullscreenChart: PropTypes.func.isRequired,
-  setActiveSection: PropTypes.func.isRequired,
-  activeSection: PropTypes.string.isRequired,
-  backtestTimestamp: PropTypes.number,
-}
-
-BacktestResultsOptionsPanel.defaultProps = {
-  backtestTimestamp: null,
 }
 
 export default BacktestResultsOptionsPanel
diff --git a/src/components/BacktestOptionsPanel/tabs/BacktestDetails.js b/src/components/BacktestOptionsPanel/tabs/BacktestDetails.js
index d4ed3f914..4b76f54bf 100644
--- a/src/components/BacktestOptionsPanel/tabs/BacktestDetails.js
+++ b/src/components/BacktestOptionsPanel/tabs/BacktestDetails.js
@@ -1,5 +1,4 @@
 import React, { useMemo } from 'react'
-import PropTypes from 'prop-types'
 import _map from 'lodash/map'
 import _delay from 'lodash/delay'
 import { useDispatch, useSelector } from 'react-redux'
@@ -9,16 +8,17 @@ import { getSymbols } from '@ufx-ui/utils'
 import { Button, Intent } from '@ufx-ui/core'
 import { getFormatTimeFn } from '../../../redux/selectors/ui'
 import getBacktestDetailsFields from './BacktestDetails.fields'
+import UIActions from '../../../redux/actions/ui'
 import WSActions from '../../../redux/actions/ws'
-import { BACKTEST_TAB_SECTIONS } from '../../StrategyEditor/tabs/BacktestTab'
-import { getBacktestById } from '../../../redux/selectors/ws'
+import { getCurrentHistoryBacktest } from '../../../redux/selectors/ws'
+import { BACKTEST_TAB_SECTIONS } from '../../../redux/reducers/ui'
 
 const { getCurrencySymbolMemo } = reduxSelectors
 
-const BacktestDetails = ({ btHistoryId, setActiveSection }) => {
+const BacktestDetails = () => {
   const formatTime = useSelector(getFormatTimeFn)
   const getCurrencySymbol = useSelector(getCurrencySymbolMemo)
-  const backtest = useSelector(getBacktestById(btHistoryId))
+  const backtest = useSelector(getCurrentHistoryBacktest)
 
   const [, quote] = getSymbols(backtest.symbol)
   const quoteCcy = getCurrencySymbol(quote)
@@ -26,6 +26,7 @@ const BacktestDetails = ({ btHistoryId, setActiveSection }) => {
   const { t } = useTranslation()
   const dispatch = useDispatch()
 
+  const setActiveSection = (section) => dispatch(UIActions.setBacktestActiveSection(section))
   const backtestDetails = useMemo(
     () => getBacktestDetailsFields({
       t,
@@ -37,12 +38,7 @@ const BacktestDetails = ({ btHistoryId, setActiveSection }) => {
   )
 
   const onButtonClick = () => {
-    dispatch(
-      WSActions.recvBacktestResults({
-        ...backtest.btResult,
-        timestamp: backtest.timestamp,
-      }),
-    )
+    dispatch(WSActions.recvBacktestResults({ ...backtest.btResult }, false))
     _delay(setActiveSection, 500, BACKTEST_TAB_SECTIONS.HISTORY_BT_RESULTS)
   }
 
@@ -69,9 +65,4 @@ const BacktestDetails = ({ btHistoryId, setActiveSection }) => {
   )
 }
 
-BacktestDetails.propTypes = {
-  btHistoryId: PropTypes.string.isRequired,
-  setActiveSection: PropTypes.func.isRequired,
-}
-
 export default BacktestDetails
diff --git a/src/components/Navbar/Navbar.Link.js b/src/components/Navbar/Navbar.Link.js
index 8b7a6bdbe..081e290d6 100644
--- a/src/components/Navbar/Navbar.Link.js
+++ b/src/components/Navbar/Navbar.Link.js
@@ -6,7 +6,7 @@ import ClassNames from 'clsx'
 import PropTypes from 'prop-types'
 import { useLocation } from 'react-router'
 import {
-  getBacktestResults,
+  getBacktestState,
   getCurrentStrategyExecutionState,
   getExecutionConnectionState,
 } from '../../redux/selectors/ws'
@@ -26,7 +26,7 @@ const NavbarButton = ({
   )
   const { isExecutionConnected } = useSelector(getExecutionConnectionState)
 
-  const { loading: btLoading, finished } = useSelector(getBacktestResults)
+  const { loading: btLoading, finished } = useSelector(getBacktestState)
 
   const getIndicator = () => {
     if (route !== strategyEditor.path || pathname === strategyEditor.path) {
diff --git a/src/components/StrategyEditor/StrategyEditor.container.js b/src/components/StrategyEditor/StrategyEditor.container.js
index ac15bdf3d..a0935c30e 100644
--- a/src/components/StrategyEditor/StrategyEditor.container.js
+++ b/src/components/StrategyEditor/StrategyEditor.container.js
@@ -9,7 +9,7 @@ import GAActions from '../../redux/actions/google_analytics'
 import WSTypes from '../../redux/constants/ws'
 import {
   getAuthToken,
-  getBacktestResults,
+  getBacktestState,
   getCurrentStrategyExecutionState,
   getSavedStrategies,
 } from '../../redux/selectors/ws'
@@ -31,7 +31,7 @@ import { LOG_LEVELS } from '../../constants/logging'
 const mapStateToProps = (state = {}) => {
   return {
     authToken: getAuthToken(state),
-    backtestResults: getBacktestResults(state),
+    backtestState: getBacktestState(state),
     executionState: getCurrentStrategyExecutionState(state),
     settingsTheme: getThemeSetting(state),
     isPaperTrading: getIsPaperTrading(state),
diff --git a/src/components/StrategyEditor/StrategyEditor.js b/src/components/StrategyEditor/StrategyEditor.js
index 35433bc9b..a7d4ac6db 100644
--- a/src/components/StrategyEditor/StrategyEditor.js
+++ b/src/components/StrategyEditor/StrategyEditor.js
@@ -71,7 +71,7 @@ const StrategyEditor = (props) => {
     onRemove,
     authToken,
     gaCreateStrategy,
-    backtestResults,
+    backtestState,
     strategyDirty,
     setStrategyDirty,
     setStrategy,
@@ -335,13 +335,13 @@ const StrategyEditor = (props) => {
   )
 
   const _cancelProcess = useCallback(() => {
-    const { gid } = backtestResults
+    const { gid } = backtestState
 
     cancelProcess(authToken, isPaperTrading, gid, loadingGid)
     closeCancelProcessModal()
   }, [
     authToken,
-    backtestResults,
+    backtestState,
     cancelProcess,
     closeCancelProcessModal,
     isPaperTrading,
@@ -634,11 +634,11 @@ const StrategyEditor = (props) => {
   const sbtitleBacktest = useCallback(
     ({ sidebarOpened }) => (
       <BacktestTabTitle
-        results={backtestResults}
+        backtestState={backtestState}
         sidebarOpened={sidebarOpened}
       />
     ),
-    [backtestResults],
+    [backtestState],
   )
 
   const sbtitleSettings = useCallback(
@@ -683,7 +683,6 @@ const StrategyEditor = (props) => {
               <BacktestTab
                 htmlKey='backtest'
                 sbtitle={sbtitleBacktest}
-                results={backtestResults}
                 onBacktestStart={onBacktestStart}
                 saveStrategyOptions={saveStrategyOptions}
                 onCancelProcess={onCancelProcess}
@@ -792,9 +791,8 @@ StrategyEditor.propTypes = {
   onRemove: PropTypes.func.isRequired,
   authToken: PropTypes.string.isRequired,
   setStrategy: PropTypes.func,
-  backtestResults: PropTypes.shape({
+  backtestState: PropTypes.shape({
     gid: PropTypes.number,
-    strategy: PropTypes.object, // eslint-disable-line
   }).isRequired,
   strategy: PropTypes.shape(STRATEGY_SHAPE),
   dsStopLiveStrategy: PropTypes.func.isRequired,
diff --git a/src/components/StrategyEditor/tabs/BacktestTab.Title.js b/src/components/StrategyEditor/tabs/BacktestTab.Title.js
index 556fb7cc1..d4030cfde 100644
--- a/src/components/StrategyEditor/tabs/BacktestTab.Title.js
+++ b/src/components/StrategyEditor/tabs/BacktestTab.Title.js
@@ -4,10 +4,10 @@ import PropTypes from 'prop-types'
 import { Icon } from 'react-fa'
 import Indicator from '../../../ui/Indicator'
 
-const BacktestTabTitle = ({ results, sidebarOpened }) => {
+const BacktestTabTitle = ({ backtestState, sidebarOpened }) => {
   const { t } = useTranslation()
 
-  const { loading, finished } = results
+  const { loading, finished } = backtestState
 
   const indicatorClassName = !sidebarOpened ? 'indicator-near-icon' : null
 
@@ -26,7 +26,7 @@ const BacktestTabTitle = ({ results, sidebarOpened }) => {
 }
 
 BacktestTabTitle.propTypes = {
-  results: PropTypes.shape({
+  backtestState: PropTypes.shape({
     loading: PropTypes.bool,
     finished: PropTypes.bool,
   }).isRequired,
diff --git a/src/components/StrategyEditor/tabs/BacktestTab.js b/src/components/StrategyEditor/tabs/BacktestTab.js
index 631c64c59..9adf518f2 100644
--- a/src/components/StrategyEditor/tabs/BacktestTab.js
+++ b/src/components/StrategyEditor/tabs/BacktestTab.js
@@ -26,16 +26,14 @@ import {
 import BacktestResultsOptionsPanel from '../../BacktestOptionsPanel/BacktestResultsOptionsPanel'
 import BacktestProgressBar from '../../BacktestProgressBar'
 import WSActions from '../../../redux/actions/ws'
+import UIActions from '../../../redux/actions/ui'
 import WSTypes from '../../../redux/constants/ws'
-import { getCurrentStrategyBacktestsList } from '../../../redux/selectors/ws'
-
-export const BACKTEST_TAB_SECTIONS = {
-  NEW_BT: 'NEW_BT',
-  NEW_BT_RESULTS: 'NEW_BT _RESULTS',
-  HISTORY_BT_LIST: 'HISTORY_BT_LIST',
-  HISTORY_BT_DETAILS: 'HISTORY_BT_DETAILS',
-  HISTORY_BT_RESULTS: 'HISTORY_BT_RESULTS',
-}
+import {
+  getBacktestState,
+  getCurrentStrategyBacktestsList,
+} from '../../../redux/selectors/ws'
+import { BACKTEST_TAB_SECTIONS } from '../../../redux/reducers/ui'
+import { getBacktestActiveSection } from '../../../redux/selectors/ui'
 
 const getInitialMessageI18Key = (activeSection) => {
   if (activeSection === BACKTEST_TAB_SECTIONS.NEW_BT) {
@@ -52,7 +50,6 @@ const getInitialMessageI18Key = (activeSection) => {
 
 const BacktestTab = (props) => {
   const {
-    results,
     onCancelProcess,
     strategy,
     indicators,
@@ -60,17 +57,22 @@ const BacktestTab = (props) => {
     onBacktestStart,
     saveStrategyOptions,
   } = props
-  const [activeSection, setActiveSection] = useState(
-    BACKTEST_TAB_SECTIONS.NEW_BT,
-  )
-  const [btHistoryId, setBtHistoryId] = useState(null)
   const [layoutConfig, setLayoutConfig] = useState()
   const [fullscreenChart, , showFullscreenChart, hideFullscreenChart] = useToggle(false)
-  const isBacktestListFetched = _isArray(useSelector(getCurrentStrategyBacktestsList))
+
+  const isBacktestListFetched = _isArray(
+    useSelector(getCurrentStrategyBacktestsList),
+  )
+  const activeSection = useSelector(getBacktestActiveSection)
+  const backtestState = useSelector(getBacktestState)
 
   const {
-    finished = false, loading, progressPerc, gid, timestamp,
-  } = results
+    finished = false,
+    loading,
+    progressPerc,
+    gid,
+    results,
+  } = backtestState
   const { id: strategyId } = strategy
   const positions = results?.strategy?.closedPositions
 
@@ -81,6 +83,13 @@ const BacktestTab = (props) => {
   const { t } = useTranslation()
   const dispatch = useDispatch()
 
+  const setActiveSection = useCallback(
+    (section) => {
+      dispatch(UIActions.setBacktestActiveSection(section))
+    },
+    [dispatch],
+  )
+
   useEffect(() => {
     if (!showBacktestResults) {
       setLayoutConfig(BACKTEST_LAYOUT_CONFIG_NO_DATA)
@@ -93,27 +102,18 @@ const BacktestTab = (props) => {
     if (finished) {
       setActiveSection(BACKTEST_TAB_SECTIONS.NEW_BT_RESULTS)
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [finished])
 
   // If a strategy has changed, reset tab state
   useEffect(() => {
-    setBtHistoryId(null)
-    dispatch(WSActions.purgeBacktestData())
-
     if (!isBacktestListFetched) {
-      dispatch(WSActions.send({
-        alias: WSTypes.ALIAS_DATA_SERVER,
-        data: ['get.bt.history.list', strategyId],
-      }))
-    }
-
-    if (activeSection === BACKTEST_TAB_SECTIONS.NEW_BT) {
-      return
-    }
-    if (activeSection === BACKTEST_TAB_SECTIONS.NEW_BT_RESULTS) {
-      setActiveSection(BACKTEST_TAB_SECTIONS.NEW_BT)
-    } else {
-      setActiveSection(BACKTEST_TAB_SECTIONS.HISTORY_BT_LIST)
+      dispatch(
+        WSActions.send({
+          alias: WSTypes.ALIAS_DATA_SERVER,
+          data: ['get.bt.history.list', strategyId],
+        }),
+      )
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [strategyId])
@@ -125,9 +125,6 @@ const BacktestTab = (props) => {
           return showBacktestResults ? (
             <BacktestResultsOptionsPanel
               showFullscreenChart={showFullscreenChart}
-              backtestTimestamp={timestamp}
-              activeSection={activeSection}
-              setActiveSection={setActiveSection}
             />
           ) : (
             <BacktestOptionsPanel
@@ -136,10 +133,6 @@ const BacktestTab = (props) => {
               saveStrategyOptions={saveStrategyOptions}
               isLoading={loading}
               onCancelProcess={onCancelProcess}
-              activeSection={activeSection}
-              setActiveSection={setActiveSection}
-              setBtHistoryId={setBtHistoryId}
-              btHistoryId={btHistoryId}
             />
           )
 
@@ -183,14 +176,11 @@ const BacktestTab = (props) => {
     [
       showBacktestResults,
       showFullscreenChart,
-      timestamp,
-      activeSection,
       strategy,
       onBacktestStart,
       saveStrategyOptions,
       loading,
       onCancelProcess,
-      btHistoryId,
       indicators,
       markets,
       fullscreenChart,
@@ -224,19 +214,6 @@ const BacktestTab = (props) => {
 }
 
 BacktestTab.propTypes = {
-  results: PropTypes.shape({
-    finished: PropTypes.bool,
-    loading: PropTypes.bool,
-    strategy: PropTypes.shape({
-      closedPositions: PropTypes.oneOfType([
-        PropTypes.arrayOf(PropTypes.string),
-        PropTypes.object,
-      ]),
-    }),
-    progressPerc: PropTypes.number,
-    gid: PropTypes.number,
-    timestamp: PropTypes.number,
-  }).isRequired,
   onCancelProcess: PropTypes.func.isRequired,
   strategy: PropTypes.shape(STRATEGY_SHAPE).isRequired,
   markets: PropTypes.arrayOf(PropTypes.shape(MARKET_SHAPE)).isRequired,
diff --git a/src/components/StrategyPerfomanceMetrics/StrategyPerfomanceMetrics.js b/src/components/StrategyPerfomanceMetrics/StrategyPerfomanceMetrics.js
index 4a696619d..6df92c094 100644
--- a/src/components/StrategyPerfomanceMetrics/StrategyPerfomanceMetrics.js
+++ b/src/components/StrategyPerfomanceMetrics/StrategyPerfomanceMetrics.js
@@ -98,7 +98,7 @@ StrategyPerfomanceMetrics.propTypes = {
     returnPerc: PropTypes.string,
     drawdown: PropTypes.string,
   }),
-  isExecuting: PropTypes.bool.isRequired,
+  isExecuting: PropTypes.bool,
   isBacktest: PropTypes.bool,
   startedOn: PropTypes.number,
 }
@@ -123,6 +123,7 @@ StrategyPerfomanceMetrics.defaultProps = {
       activeMarket: null,
     },
   },
+  isExecuting: false,
   isBacktest: false,
   startedOn: 0,
 }
diff --git a/src/redux/actions/ui.js b/src/redux/actions/ui.js
index 272490cd7..df1d67419 100644
--- a/src/redux/actions/ui.js
+++ b/src/redux/actions/ui.js
@@ -170,6 +170,11 @@ export const logInformation = (message, level, action, trace) => ({
   },
 })
 
+export const setBacktestActiveSection = (section) => ({
+  type: types.SET_BACKTEST_ACTIVE_SECTION,
+  payload: { section },
+})
+
 export default {
   setUIValue,
   updateUIValue,
@@ -195,4 +200,5 @@ export default {
   setCurrentStrategy,
   setIsStrategyDirty,
   logInformation,
+  setBacktestActiveSection,
 }
diff --git a/src/redux/actions/ws.js b/src/redux/actions/ws.js
index b6bfc1d9b..47c337f77 100644
--- a/src/redux/actions/ws.js
+++ b/src/redux/actions/ws.js
@@ -257,9 +257,9 @@ export default {
     },
   }),
 
-  recvBacktestResults: (opts) => ({
+  recvBacktestResults: (opts, isExecuted) => ({
     type: t.BACKTEST_RESULTS,
-    payload: opts,
+    payload: { results: opts, isExecuted },
   }),
 
   recvBacktestStarted: (gid) => ({
@@ -400,6 +400,10 @@ export default {
     type: t.BACKTEST_REMOVE,
     payload: { backtestId },
   }),
+  setHistoryBacktestId: (id) => ({
+    type: t.SET_HISTORY_BACKTEST_ID,
+    payload: { id },
+  }),
 
   initAuth: (password) => send(['auth.init', password, MAIN_MODE, getScope()]),
   auth: (password, mode) => send(['auth.submit', password, mode, getScope()]),
diff --git a/src/redux/constants/ui.js b/src/redux/constants/ui.js
index f2c23e6fb..a92a3f5d7 100644
--- a/src/redux/constants/ui.js
+++ b/src/redux/constants/ui.js
@@ -42,4 +42,6 @@ module.exports = {
 
   REMOVE_STRATEGY: 'UI_REMOVE_STRATEGY',
   LOG: 'UI_LOG',
+
+  SET_BACKTEST_ACTIVE_SECTION: 'UI_SET_BACKTEST_ACTIVE_SECTION',
 }
diff --git a/src/redux/constants/ws.js b/src/redux/constants/ws.js
index 12d6e5e54..692bc0409 100644
--- a/src/redux/constants/ws.js
+++ b/src/redux/constants/ws.js
@@ -84,6 +84,7 @@ export default {
   SET_STOPPED_LIVE_STRATEGY: 'WS_SET_STOPPED_LIVE_STRATEGY',
   SET_BACKTEST_LOADING: 'WS_SET_BACKTEST_LOADING',
   SET_BACKTEST_TO_HISTORY: 'WS_SET_BACKTEST_TO_HISTORY',
+  SET_HISTORY_BACKTEST_ID: 'WS_SET_HISTORY_BACKTEST_ID',
   UPDATE_FAVORITE_PAIRS: 'WS_UPDATE_FAVORITE_PAIRS',
 
   BUFFER_DATA_FROM_EXCHANGE: 'WS_BUFFER_DATA_FROM_EXCHANGE',
diff --git a/src/redux/middleware/ws/on_message.js b/src/redux/middleware/ws/on_message.js
index 6805a8059..40d18270c 100644
--- a/src/redux/middleware/ws/on_message.js
+++ b/src/redux/middleware/ws/on_message.js
@@ -473,7 +473,7 @@ export default (alias, store) => (e = {}) => {
           store.dispatch(UIActions.logInformation(error, LOG_LEVELS.ERROR, 'backtest_failed'))
           break
         }
-        store.dispatch(WSActions.recvBacktestResults(res))
+        store.dispatch(WSActions.recvBacktestResults(res, true))
         store.dispatch(UIActions.logInformation('Backtest finished successfully', LOG_LEVELS.INFO, 'backtest_success'))
         break
       }
diff --git a/src/redux/reducers/ui/index.js b/src/redux/reducers/ui/index.js
index b0f78cb91..44532c7d6 100644
--- a/src/redux/reducers/ui/index.js
+++ b/src/redux/reducers/ui/index.js
@@ -50,6 +50,14 @@ export const PAPER_MODE = 'paper'
 export const MAIN_MODE = 'main'
 let shownOldFormatModal = false
 
+export const BACKTEST_TAB_SECTIONS = {
+  NEW_BT: 'NEW_BT',
+  NEW_BT_RESULTS: 'NEW_BT _RESULTS',
+  HISTORY_BT_LIST: 'HISTORY_BT_LIST',
+  HISTORY_BT_DETAILS: 'HISTORY_BT_DETAILS',
+  HISTORY_BT_RESULTS: 'HISTORY_BT_RESULTS',
+}
+
 const DEFAULT_MARKET = {
   contexts: ['e', 'm'],
   restID: 'tBTCUSD',
@@ -80,6 +88,7 @@ function getInitialState() {
       strategyMainMode: {},
       strategySandboxMode: {},
       isStrategyDirty: false,
+      backtestActiveSection: BACKTEST_TAB_SECTIONS.NEW_BT,
     },
     unsavedLayout: null,
     layoutID: null,
@@ -346,7 +355,7 @@ function reducer(state = getInitialState(), action = {}) {
 
     case types.SET_CURRENT_STRATEGY: {
       const { strategy, mode } = payload
-      const { isPaperTrading } = state
+      const { isPaperTrading, strategyEditor: { backtestActiveSection: _backtestActiveSection } } = state
 
       let key = null
       if (!mode) {
@@ -355,11 +364,25 @@ function reducer(state = getInitialState(), action = {}) {
         key = mode === PAPER_MODE ? 'strategySandboxMode' : 'strategyMainMode'
       }
 
+      let backtestActiveSection = _backtestActiveSection
+      if (isPaperTrading) {
+        switch (backtestActiveSection) {
+          case BACKTEST_TAB_SECTIONS.NEW_BT:
+            break
+          case BACKTEST_TAB_SECTIONS.NEW_BT_RESULTS:
+            backtestActiveSection = BACKTEST_TAB_SECTIONS.NEW_BT
+            break
+          default:
+            backtestActiveSection = BACKTEST_TAB_SECTIONS.HISTORY_BT_LIST
+        }
+      }
+
       return {
         ...state,
         strategyEditor: {
           ...state.strategyEditor,
           [key]: strategy,
+          backtestActiveSection,
         },
       }
     }
@@ -382,6 +405,18 @@ function reducer(state = getInitialState(), action = {}) {
       }
     }
 
+    case types.SET_BACKTEST_ACTIVE_SECTION: {
+      const { section } = payload
+
+      return {
+        ...state,
+        strategyEditor: {
+          ...state.strategyEditor,
+          backtestActiveSection: section,
+        },
+      }
+    }
+
     case types.SET_TRADING_MODE: {
       const { isPaperTrading } = payload
       const mode = isPaperTrading ? PAPER_MODE : MAIN_MODE
diff --git a/src/redux/reducers/ws/backtest.js b/src/redux/reducers/ws/backtest.js
index ecc611937..220b5228a 100644
--- a/src/redux/reducers/ws/backtest.js
+++ b/src/redux/reducers/ws/backtest.js
@@ -1,7 +1,9 @@
-import types from '../../constants/ws'
+import WSTypes from '../../constants/ws'
+import UITypes from '../../constants/ui'
 
 function getInitialState() {
   return {
+    result: null,
     currentTest: null,
     loading: false,
     executing: false,
@@ -16,7 +18,7 @@ function getInitialState() {
 function reducer(state = getInitialState(), action = {}) {
   const { type, payload = {} } = action
   switch (type) {
-    case types.BACKTEST_EXECUTE: {
+    case WSTypes.BACKTEST_EXECUTE: {
       // data server has received backtest request
       // and is syncing data
       const newState = getInitialState()
@@ -27,7 +29,7 @@ function reducer(state = getInitialState(), action = {}) {
       }
     }
 
-    case types.BACKTEST_START: {
+    case WSTypes.BACKTEST_START: {
       // data server is about to start sending
       // backtest data
       return {
@@ -37,14 +39,14 @@ function reducer(state = getInitialState(), action = {}) {
       }
     }
 
-    case types.SET_BACKTEST_LOADING: {
+    case WSTypes.SET_BACKTEST_LOADING: {
       return {
         ...state,
         loading: true,
       }
     }
 
-    case types.BACKTEST_PROGRESS: {
+    case WSTypes.BACKTEST_PROGRESS: {
       const { progressPerc } = payload
       return {
         ...state,
@@ -52,14 +54,16 @@ function reducer(state = getInitialState(), action = {}) {
       }
     }
 
-    case types.BACKTEST_RESULTS: {
+    case WSTypes.BACKTEST_RESULTS: {
+      const { results, isExecuted } = payload
       return {
         ...state,
-        ...payload,
+        finished: isExecuted,
+        results,
       }
     }
 
-    case types.BACKTEST_STARTED: {
+    case WSTypes.BACKTEST_STARTED: {
       const { gid } = payload
 
       return {
@@ -68,27 +72,27 @@ function reducer(state = getInitialState(), action = {}) {
       }
     }
 
-    case types.BACKTEST_STOPPED: {
+    case WSTypes.BACKTEST_STOPPED: {
       return {
         ...state,
         loading: false,
         executing: false,
-        finished: true,
         gid: null,
       }
     }
 
-    case types.DISCONNECTED:
-    case types.PURGE_DATA_BACKTEST: {
+    case WSTypes.DISCONNECTED:
+    case WSTypes.PURGE_DATA_BACKTEST:
+    case UITypes.SET_CURRENT_STRATEGY: {
       return getInitialState()
     }
 
-    case types.BACKTEST_CANDLE: {
+    case WSTypes.BACKTEST_CANDLE: {
       state.candles.push(payload)
       return state
     }
 
-    case types.BACKTEST_TRADE: {
+    case WSTypes.BACKTEST_TRADE: {
       state.trades.push(payload)
       return state
     }
diff --git a/src/redux/reducers/ws/backtestHistory.js b/src/redux/reducers/ws/backtestHistory.js
index a3f8adca4..1758e4343 100644
--- a/src/redux/reducers/ws/backtestHistory.js
+++ b/src/redux/reducers/ws/backtestHistory.js
@@ -4,10 +4,12 @@ import _omit from 'lodash/omit'
 import _filter from 'lodash/filter'
 import _isEmpty from 'lodash/isEmpty'
 import WSTypes from '../../constants/ws'
+import UITypes from '../../constants/ui'
 
 const getInitialState = () => ({
   mappedKeysByStrategyIds: {},
   backtests: {},
+  backtestId: null,
 })
 
 const reducer = (state = getInitialState(), action = {}) => {
@@ -113,6 +115,22 @@ const reducer = (state = getInitialState(), action = {}) => {
       }
     }
 
+    case WSTypes.SET_HISTORY_BACKTEST_ID: {
+      const { id } = payload
+
+      return {
+        ...state,
+        backtestId: id,
+      }
+    }
+
+    case UITypes.SET_CURRENT_STRATEGY: {
+      return {
+        ...state,
+        backtestId: null,
+      }
+    }
+
     default: {
       return state
     }
diff --git a/src/redux/selectors/ui/get_backtest_active_section.js b/src/redux/selectors/ui/get_backtest_active_section.js
new file mode 100644
index 000000000..abd342654
--- /dev/null
+++ b/src/redux/selectors/ui/get_backtest_active_section.js
@@ -0,0 +1,13 @@
+import _get from 'lodash/get'
+import { REDUCER_PATHS } from '../../config'
+import { BACKTEST_TAB_SECTIONS } from '../../reducers/ui'
+
+const path = REDUCER_PATHS.UI
+
+const getBacktestActiveSection = (state) => _get(
+  state,
+  `${path}.strategyEditor.backtestActiveSection`,
+  BACKTEST_TAB_SECTIONS.NEW_BT,
+)
+
+export default getBacktestActiveSection
diff --git a/src/redux/selectors/ui/index.js b/src/redux/selectors/ui/index.js
index 3d5faf3bf..582f3f538 100644
--- a/src/redux/selectors/ui/index.js
+++ b/src/redux/selectors/ui/index.js
@@ -16,6 +16,7 @@ import getUIModalStateForKey from './get_ui_modal_state'
 import getCurrentStrategy from './get_current_strategy'
 import getIsStrategyDirty from './get_is_strategy_dirty'
 import getFormatTimeFn from './get_format_time_fn'
+import getBacktestActiveSection from './get_backtest_active_section'
 
 export * from './get_settings'
 export * from './get_core_settings'
@@ -41,4 +42,5 @@ export {
   getIsStrategyDirty,
   getUIModalStateForKey,
   getFormatTimeFn,
+  getBacktestActiveSection,
 }
diff --git a/src/redux/selectors/ws/get_backtest_by_id.js b/src/redux/selectors/ws/get_backtest_by_id.js
deleted file mode 100644
index e0a1def60..000000000
--- a/src/redux/selectors/ws/get_backtest_by_id.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createSelector } from 'reselect'
-import _get from 'lodash/get'
-import { getBacktestHistory } from '.'
-
-const getBacktestById = (executionId) => createSelector([getBacktestHistory], (backtestHistory) => {
-  const { backtests } = backtestHistory
-  return _get(backtests, executionId, {})
-})
-
-export default getBacktestById
diff --git a/src/redux/selectors/ws/get_backtest_results.js b/src/redux/selectors/ws/get_backtest_results.js
index 47b81bd2e..e8fda0591 100644
--- a/src/redux/selectors/ws/get_backtest_results.js
+++ b/src/redux/selectors/ws/get_backtest_results.js
@@ -5,4 +5,4 @@ const path = REDUCER_PATHS.WS
 
 const EMPTY_OBJ = {}
 
-export default (state) => _get(state, `${path}.backtest`, EMPTY_OBJ)
+export default (state) => _get(state, `${path}.backtest.results`, EMPTY_OBJ)
diff --git a/src/redux/selectors/ws/get_backtest_state.js b/src/redux/selectors/ws/get_backtest_state.js
index 5bec09085..47b81bd2e 100644
--- a/src/redux/selectors/ws/get_backtest_state.js
+++ b/src/redux/selectors/ws/get_backtest_state.js
@@ -3,9 +3,6 @@ import { REDUCER_PATHS } from '../../config'
 
 const path = REDUCER_PATHS.WS
 
-export default (state) => {
-  const currentTest = _get(state, `${path}.backtest.currentTest`, {})
-  const loading = _get(state, `${path}.backtest.loading`, false)
-  const executing = _get(state, `${path}.backtest.executing`, false)
-  return { ...currentTest, loading, executing }
-}
+const EMPTY_OBJ = {}
+
+export default (state) => _get(state, `${path}.backtest`, EMPTY_OBJ)
diff --git a/src/redux/selectors/ws/get_current_history_backtest.js b/src/redux/selectors/ws/get_current_history_backtest.js
new file mode 100644
index 000000000..eb4af015c
--- /dev/null
+++ b/src/redux/selectors/ws/get_current_history_backtest.js
@@ -0,0 +1,10 @@
+import { createSelector } from 'reselect'
+import _get from 'lodash/get'
+import { getBacktestHistory } from '.'
+
+const getCurrentHistoryBacktest = createSelector([getBacktestHistory], (backtestHistory) => {
+  const { backtests, backtestId } = backtestHistory
+  return _get(backtests, backtestId, {})
+})
+
+export default getCurrentHistoryBacktest
diff --git a/src/redux/selectors/ws/index.js b/src/redux/selectors/ws/index.js
index a1b34f1d9..5a95cdbb8 100644
--- a/src/redux/selectors/ws/index.js
+++ b/src/redux/selectors/ws/index.js
@@ -32,7 +32,7 @@ import getBacktestState from './get_backtest_state'
 import getBacktestData from './get_backtest_data'
 import getBacktestResults from './get_backtest_results'
 import getBacktestHistory from './get_backtest_history'
-import getBacktestById from './get_backtest_by_id'
+import getCurrentHistoryBacktest from './get_current_history_backtest'
 import getCurrentStrategyBacktestsList from './get_current_strategy_backtests_list'
 
 import {
@@ -82,7 +82,7 @@ export {
   getBacktestResults,
   getBacktestHistory,
   getCurrentStrategyBacktestsList,
-  getBacktestById,
+  getCurrentHistoryBacktest,
 
   apiClientConnected,
   apiClientConnecting,