diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index c753c5f606..5328bd8aac 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -554,6 +554,9 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
       props.event.trigger("staticAnalysisWarning", [-1])
     } else {
       setBasicEnabled(true)
+      if(!solhintEnabled) {
+        setSelectedTab("remix")
+      }
       props.analysisModule.basicEnabled = true
       props.event.trigger("staticAnalysisWarning", [-1])
     }
@@ -569,6 +572,9 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
       props.event.trigger("staticAnalysisWarning", [-1])
     } else {
       setSolhintEnabled(true)
+      if(!basicEnabled) {
+        setSelectedTab("solhint")
+      }
       props.analysisModule.solhintEnabled = true
       props.event.trigger("staticAnalysisWarning", [-1])
     }