diff --git a/src/components/AppLayout/AppChannelSelect.tsx b/src/components/AppLayout/AppChannelSelect.tsx
index 6760b7fde..66ad4e3f2 100644
--- a/src/components/AppLayout/AppChannelSelect.tsx
+++ b/src/components/AppLayout/AppChannelSelect.tsx
@@ -23,13 +23,11 @@ const useStyles = makeStyles(
 
 export interface AppChannelSelectProps extends ChannelProps {
   channels: ChannelFragment[];
-  disabled: boolean;
   onChannelSelect: (id: string) => void;
 }
 
 const AppChannelSelect: React.FC<AppChannelSelectProps> = ({
   channels,
-  disabled,
   onChannelSelect,
   selectedChannelId
 }) => {
@@ -40,7 +38,6 @@ const AppChannelSelect: React.FC<AppChannelSelectProps> = ({
       <SingleSelectField
         testId="app-channel-select"
         choices={mapNodeToChoice(channels)}
-        disabled={disabled}
         value={selectedChannelId}
         onChange={event => onChannelSelect(event.target.value)}
       />
diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx
index 36edfdd9e..6bbe3fb20 100644
--- a/src/components/AppLayout/AppLayout.tsx
+++ b/src/components/AppLayout/AppLayout.tsx
@@ -216,10 +216,9 @@ const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
                               .includes("mac")}
                             onClick={() => setNavigatorVisibility(true)}
                           />
-                          {channel && location.pathname === "/" && (
+                          {channel && isPickerActive && (
                             <AppChannelSelect
                               channels={availableChannels}
-                              disabled={!isPickerActive}
                               selectedChannelId={channel.id}
                               onChannelSelect={setChannel}
                             />