diff --git a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
index c386655384..8d2e2a9237 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
@@ -14,6 +14,7 @@ import {
 import { useUserContext } from '@/shared/context/user-context'
 import { useTranslation } from 'react-i18next'
 import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
+import usePersistedState from '@/shared/hooks/use-persisted-state'
 
 type Mode = 'viewing' | 'reviewing' | 'editing'
 
@@ -144,11 +145,21 @@ const ModeSwitcherToggleButtonContent = forwardRef<
     ariaExpanded: boolean
   }
 >(({ onClick, className, iconType, label, ariaExpanded }, ref) => {
+  const [isFirstTimeUsed, setIsFirstTimeUsed] = usePersistedState(
+    `modeSwitcherFirstTimeUsed`,
+    true
+  )
+
   return (
     <button
-      className={classNames('review-mode-switcher-toggle-button', className)}
+      className={classNames('review-mode-switcher-toggle-button', className, {
+        'review-mode-switcher-toggle-button-expanded': isFirstTimeUsed,
+      })}
       ref={ref}
-      onClick={onClick}
+      onClick={event => {
+        setIsFirstTimeUsed(false)
+        onClick(event)
+      }}
       aria-expanded={ariaExpanded}
     >
       <MaterialIcon className="material-symbols-outlined" type={iconType} />
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss
index 9803329db7..2b975e79c0 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss
@@ -839,4 +839,10 @@
   .review-mode-switcher-toggle-label {
     display: none;
   }
+
+  &.review-mode-switcher-toggle-button-expanded {
+    .review-mode-switcher-toggle-label {
+      display: block;
+    }
+  }
 }