diff --git a/packages/ui/src/features/canvas/hooks/useChannelsLayout.ts b/packages/ui/src/features/canvas/hooks/useChannelsLayout.ts
index 2d891f42be..23a0e28ffa 100644
--- a/packages/ui/src/features/canvas/hooks/useChannelsLayout.ts
+++ b/packages/ui/src/features/canvas/hooks/useChannelsLayout.ts
@@ -10,6 +10,9 @@ export function useChannelsLayout(): boolean {
     PROJECT_BLUEBIRD_FLAG,
     import.meta.env.DEV,
   );
-  const layoutEnabled = useFeatureFlag(CHANNELS_LAYOUT_FLAG, false);
+  const layoutEnabled = useFeatureFlag(
+    CHANNELS_LAYOUT_FLAG,
+    import.meta.env.DEV,
+  );
   return layoutEnabled && bluebirdEnabled;
 }
diff --git a/packages/ui/src/features/command/CommandSearchBar.tsx b/packages/ui/src/features/command/CommandSearchBar.tsx
index 9b905e4b62..5906f830e6 100644
--- a/packages/ui/src/features/command/CommandSearchBar.tsx
+++ b/packages/ui/src/features/command/CommandSearchBar.tsx
@@ -18,12 +18,12 @@ export function CommandSearchBar({ onClick }: { onClick: () => void }) {
   return (
     // The row is a window-drag region; the field has to opt out of it or the
     // press that should open the menu drags the window instead.
-    <div className="no-drag mt-px min-w-0 flex-1 px-3">
+    <div className="mt-px min-w-0 flex-1 px-3">
       <button
         type="button"
         aria-label="Search"
         onClick={onClick}
-        className="mx-auto flex h-7 w-full max-w-120 items-center gap-2 rounded-sm bg-fill-hover pr-1 pl-2 hover:bg-fill-selected dark:hover:bg-input/80"
+        className="no-drag mx-auto flex h-7 w-full max-w-120 items-center gap-2 rounded-sm bg-fill-hover pr-1 pl-2 hover:bg-fill-selected dark:hover:bg-input/80"
       >
         <MagnifyingGlass size={14} className="shrink-0" />
         <span className="min-w-0 flex-1 truncate text-left text-[13px]">