fixes and improvements

Author: SunsetTechuila

index.ts

@@ -186,8 +186,11 @@ TEST: addTests('isNotifications', [
 
 export const isOrganizationProfile = (): boolean => exists('meta[name="hovercard-subject-tag"][content^="organization"]');
 
-// TODO: Remove the second check after June 2026
-export const isOrganizationRepo = (): boolean => Boolean($('qbsearch-input')?.getAttribute('data-current-org')) || exists('.AppHeader-context-full [data-hovercard-type="organization"]');
+export const isOrganizationRepo = (): boolean => exists([
+	'qbsearch-input[data-current-repository]:not([data-current-repository=""])[data-current-org]:not([data-current-org=""])',
+	// TODO: Remove after June 2026
+	'.AppHeader-context-full [data-hovercard-type="organization"]',
+].join(','));
 
 export const isTeamDiscussion = (url: URL | HTMLAnchorElement | Location = location): boolean => Boolean(getOrg(url)?.path.startsWith('teams'));
 TEST: addTests('isTeamDiscussion', [