diff --git a/webapp/src/components/cardDialog.test.tsx b/webapp/src/components/cardDialog.test.tsx
index dd1da60bc62..e6f727c3be8 100644
--- a/webapp/src/components/cardDialog.test.tsx
+++ b/webapp/src/components/cardDialog.test.tsx
@@ -55,6 +55,7 @@ describe('components/cardDialog', () => {
             cards: {
                 [card.id]: card,
             },
+            current: card.id,
         },
         boards: {
             boards: {
diff --git a/webapp/src/components/centerPanel.test.tsx b/webapp/src/components/centerPanel.test.tsx
index 380425a3c68..9f3deb0a102 100644
--- a/webapp/src/components/centerPanel.test.tsx
+++ b/webapp/src/components/centerPanel.test.tsx
@@ -98,6 +98,7 @@ describe('components/centerPanel', () => {
         cards: {
             templates: [card1, card2],
             cards: [card1, card2],
+            current: card1.id,
         },
         views: {
             views: {
diff --git a/webapp/src/components/onboardingTour/addProperties/add_properties.tsx b/webapp/src/components/onboardingTour/addProperties/add_properties.tsx
index 662c6d5f379..0b63efe30d1 100644
--- a/webapp/src/components/onboardingTour/addProperties/add_properties.tsx
+++ b/webapp/src/components/onboardingTour/addProperties/add_properties.tsx
@@ -1,6 +1,6 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
-import React from 'react'
+import React, {useEffect} from 'react'
 
 import {FormattedMessage} from 'react-intl'
 
@@ -10,8 +10,21 @@ import './add_properties.scss'
 import {Utils} from '../../../utils'
 import addProperty from '../../../../static/addProperty.gif'
 
-import {CardTourSteps, TOUR_CARD} from '../index'
+import {BaseTourSteps, CardTourSteps, TOUR_BASE, TOUR_CARD} from '../index'
 import TourTipRenderer from '../tourTipRenderer/tourTipRenderer'
+import {OnboardingBoardTitle, OnboardingCardTitle} from '../../cardDetail/cardDetail'
+import {useAppDispatch, useAppSelector} from '../../../store/hooks'
+import {
+    getMe,
+    getOnboardingTourCategory,
+    getOnboardingTourStarted,
+    getOnboardingTourStep,
+    patchProps,
+} from '../../../store/users'
+import {IUser, UserConfigPatch, UserPropPrefix} from '../../../user'
+import mutator from '../../../mutator'
+import {getCurrentBoard} from '../../../store/boards'
+import {getCurrentCard} from '../../../store/cards'
 
 const AddPropertiesTourStep = (): JSX.Element | null => {
     const title = (
@@ -29,6 +42,53 @@ const AddPropertiesTourStep = (): JSX.Element | null => {
 
     const punchout = useMeasurePunchouts(['.octo-propertyname.add-property'], [])
 
+    const me = useAppSelector<IUser|null>(getMe)
+    const dispatch = useAppDispatch()
+
+    const board = useAppSelector(getCurrentBoard)
+    const isOnboardingBoard = board ? board.title === OnboardingBoardTitle : false
+
+    const card = useAppSelector(getCurrentCard)
+    const isOnboardingCard = card ? card.title === OnboardingCardTitle : false
+
+    const onboardingTourStarted = useAppSelector(getOnboardingTourStarted)
+    const onboardingTourCategory = useAppSelector(getOnboardingTourCategory)
+    const onboardingTourStep = useAppSelector(getOnboardingTourStep)
+
+    // start the card tour if onboarding card is opened up
+    // and the user is still on the base tour
+    useEffect(() => {
+        async function task() {
+            if (!me || !card) {
+                return
+            }
+
+            const should = card.id &&
+                isOnboardingBoard &&
+                isOnboardingCard &&
+                onboardingTourStarted &&
+                onboardingTourCategory === TOUR_BASE &&
+                onboardingTourStep === BaseTourSteps.OPEN_A_CARD.toString()
+
+            if (!should) {
+                return
+            }
+
+            const patch: UserConfigPatch = {}
+            patch.updatedFields = {}
+            patch.updatedFields[UserPropPrefix + 'tourCategory'] = TOUR_CARD
+            patch.updatedFields[UserPropPrefix + 'onboardingTourStep'] = CardTourSteps.ADD_PROPERTIES.toString()
+
+            const updatedProps = await mutator.patchUserConfig(me.id, patch)
+            if (updatedProps) {
+                dispatch(patchProps(updatedProps))
+            }
+        }
+
+        // this hack is needed to allow performing async task in useEffect
+        task()
+    }, [card])
+
     return (
         <TourTipRenderer
             key='AddPropertiesTourStep'
diff --git a/webapp/src/components/pulsating_dot/pulsating_dot.scss b/webapp/src/components/pulsating_dot/pulsating_dot.scss
index 165383dccf2..766b45d8310 100644
--- a/webapp/src/components/pulsating_dot/pulsating_dot.scss
+++ b/webapp/src/components/pulsating_dot/pulsating_dot.scss
@@ -4,10 +4,7 @@
     align-items: center;
     justify-content: center;
     margin-left: auto;
-
-    &-clickable {
-        cursor: pointer;
-    }
+    cursor: pointer;
 
     &,
     &::before,