diff --git a/web/src/TourConfig.js b/web/src/TourConfig.js
index 819b9704..d9682040 100644
--- a/web/src/TourConfig.js
+++ b/web/src/TourConfig.js
@@ -208,10 +208,14 @@ let orgIsTourVisible = true;
 
 export function setOrgIsTourVisible(visible) {
   orgIsTourVisible = visible;
+  if (orgIsTourVisible === false) {
+    setIsTourVisible(false);
+  }
 }
 
 export function setIsTourVisible(visible) {
   localStorage.setItem("isTourVisible", visible);
+  window.dispatchEvent(new Event("storageTourChanged"));
 }
 
 export function setTourLogo(tourLogoSrc) {
@@ -221,7 +225,7 @@ export function setTourLogo(tourLogoSrc) {
 }
 
 export function getTourVisible() {
-  return localStorage.getItem("isTourVisible") !== "false" && orgIsTourVisible;
+  return localStorage.getItem("isTourVisible") !== "false";
 }
 
 export function getNextButtonChild(nextPathName) {
diff --git a/web/src/common/OpenTour.js b/web/src/common/OpenTour.js
index 11609c1a..312d3a8c 100644
--- a/web/src/common/OpenTour.js
+++ b/web/src/common/OpenTour.js
@@ -31,17 +31,11 @@ class OpenTour extends React.Component {
     return TourConfig.TourUrlList.indexOf(path) !== -1 || path === "";
   };
 
-  handleTourClick = () => {
-    TourConfig.setIsTourVisible(true);
-    const event = new Event("storageTourChanged");
-    window.dispatchEvent(event);
-  };
-
   render() {
     return (
       this.canTour() ?
         <Tooltip title="Click to open tour">
-          <div className="select-box" style={{display: Setting.isMobile() ? "none" : null, ...this.props.style}} onClick={this.handleTourClick}>
+          <div className="select-box" style={{display: Setting.isMobile() ? "none" : null, ...this.props.style}} onClick={() => TourConfig.setIsTourVisible(true)} >
             <QuestionCircleOutlined style={{fontSize: "24px"}} />
           </div>
         </Tooltip>