diff --git a/src/app/views/sidebar/sample-queries/SampleQueries.tsx b/src/app/views/sidebar/sample-queries/SampleQueries.tsx index c33508ce7..8486d154a 100644 --- a/src/app/views/sidebar/sample-queries/SampleQueries.tsx +++ b/src/app/views/sidebar/sample-queries/SampleQueries.tsx @@ -371,7 +371,12 @@ const Samples: React.FC = ({ queries, groups, searchValue }) => { }, [queries]); useEffect(() => { - if (!mobileScreen && !hasAutoSelected && queries.length > 0) { + const urlParams = new URLSearchParams(window.location.search); + const hasSharedQuery = urlParams.has('request') && urlParams.has('method'); + + const shouldAutoSelect = !hasAutoSelected && !selectedQueryKey && !hasSharedQuery; + + if (!mobileScreen && queries.length > 0 && shouldAutoSelect) { const defaultSample = queries.find(q => q.method === 'GET' && q.humanName.toLowerCase().includes('my profile') ); @@ -384,7 +389,7 @@ const Samples: React.FC = ({ queries, groups, searchValue }) => { dispatch({ type: 'samples/setHasAutoSelectedDefault', payload: true }); } } - }, [mobileScreen, queries, hasAutoSelected, dispatch]); + }, [mobileScreen, queries, hasAutoSelected, dispatch, selectedQueryKey]); useEffect(() => { if (groups && groups.length > 0) { setOpenItems(prev => {