diff --git a/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchTerm.tsx b/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchTerm.tsx
index 63bb2bc21..f32d67670 100644
--- a/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchTerm.tsx
+++ b/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchTerm.tsx
@@ -36,97 +36,106 @@ export const PowerSearchTerm: React.FC<PowerSearchTermProps> = ({
   onCancel,
   onFinalize,
 }) => {
-  let searchValueInputComponent: React.ReactNode = null;
-  switch (searchTerm.operator.valueType) {
-    case 'STRING': {
-      searchValueInputComponent = (
-        <PowerSearchStringTerm
-          onCancel={onCancel}
-          onChange={(newValue) => {
-            onFinalize({
-              ...searchTerm,
-              searchValue: newValue,
-            });
-          }}
-        />
-      );
-      break;
+  let searchValueComponent: React.ReactNode = null;
+  if (searchValueRenderer === 'input') {
+    switch (searchTerm.operator.valueType) {
+      case 'STRING': {
+        searchValueComponent = (
+          <PowerSearchStringTerm
+            onCancel={onCancel}
+            onChange={(newValue) => {
+              onFinalize({
+                ...searchTerm,
+                searchValue: newValue,
+              });
+            }}
+          />
+        );
+        break;
+      }
+      case 'INTEGER': {
+        searchValueComponent = (
+          <PowerSearchIntegerTerm
+            onCancel={onCancel}
+            onChange={(newValue) => {
+              onFinalize({
+                ...searchTerm,
+                searchValue: newValue,
+              });
+            }}
+          />
+        );
+        break;
+      }
+      case 'FLOAT': {
+        searchValueComponent = (
+          <PowerSearchFloatTerm
+            onCancel={onCancel}
+            onChange={(newValue) => {
+              onFinalize({
+                ...searchTerm,
+                searchValue: newValue,
+              });
+            }}
+          />
+        );
+        break;
+      }
+      case 'NO_VALUE': {
+        // Nothing needs to be done. It should never be the case.
+        searchValueComponent = null;
+        break;
+      }
+      case 'ENUM': {
+        searchValueComponent = (
+          <PowerSearchEnumTerm
+            onCancel={onCancel}
+            onChange={(newValue) => {
+              onFinalize({
+                ...searchTerm,
+                searchValue: newValue,
+              });
+            }}
+            enumLabels={searchTerm.operator.enumLabels}
+          />
+        );
+        break;
+      }
+      default: {
+        console.error(
+          'PowerSearchTerm -> unknownoperator.valueType',
+          searchTerm.operator.valueType,
+          searchTerm,
+        );
+      }
     }
-    case 'INTEGER': {
-      searchValueInputComponent = (
-        <PowerSearchIntegerTerm
-          onCancel={onCancel}
-          onChange={(newValue) => {
-            onFinalize({
-              ...searchTerm,
-              searchValue: newValue,
-            });
-          }}
-        />
-      );
-      break;
-    }
-    case 'FLOAT': {
-      searchValueInputComponent = (
-        <PowerSearchFloatTerm
-          onCancel={onCancel}
-          onChange={(newValue) => {
-            onFinalize({
-              ...searchTerm,
-              searchValue: newValue,
-            });
-          }}
-        />
-      );
-      break;
-    }
-    case 'NO_VALUE': {
-      // Nothing needs to be done. The effect below is going to fire and mark it as the final value.
-      searchValueInputComponent = null;
-      break;
-    }
-    case 'ENUM': {
-      searchValueInputComponent = (
-        <PowerSearchEnumTerm
-          onCancel={onCancel}
-          onChange={(newValue) => {
-            onFinalize({
-              ...searchTerm,
-              searchValue: newValue,
-            });
-          }}
-          enumLabels={searchTerm.operator.enumLabels}
-        />
-      );
-      break;
-    }
-    default: {
-      console.error(
-        'PowerSearchTerm -> unknownoperator.valueType',
-        searchTerm.operator.valueType,
-        searchTerm,
-      );
+  } else {
+    switch (searchTerm.operator.valueType) {
+      case 'ENUM': {
+        searchValueComponent = (
+          <Button>
+            {searchTerm.operator.enumLabels[searchTerm.searchValue]}
+          </Button>
+        );
+        break;
+      }
+      case 'NO_VALUE': {
+        searchValueComponent = null;
+        break;
+      }
+      default: {
+        searchValueComponent = <Button>{searchTerm.searchValue}</Button>;
+      }
     }
   }
 
-  React.useEffect(() => {
-    if (searchTerm.operator.valueType === 'NO_VALUE') {
-      onFinalize({
-        ...searchTerm,
-        searchValue: null,
-      });
-    }
-  }, [searchTerm, onFinalize]);
-
   return (
     <Space.Compact block size="small">
       <Button>{searchTerm.field.label}</Button>
-      <Button>{searchTerm.operator.label}</Button>
-      {searchValueRenderer === 'button' ? (
-        <Button>{searchTerm.searchValue ?? '...'}</Button>
-      ) : (
-        searchValueInputComponent
-      )}
+      {searchTerm.operator.label ? (
+        <Button>{searchTerm.operator.label}</Button>
+      ) : null}
+      {searchValueComponent}
       <Button
         icon={<CloseOutlined />}
         onClick={() => {
diff --git a/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx b/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx
index ef2f3d4f0..7be8ac49d 100644
--- a/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx
+++ b/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx
@@ -116,8 +116,9 @@ export const PowerSearch: React.FC<PowerSearchProps> = ({
               onFinalize={(finalSearchTerm) => {
                 setSearchExpression((prevSearchExpression) => {
                   return [
-                    ...prevSearchExpression.slice(0, -1),
+                    ...prevSearchExpression.slice(0, i),
                     finalSearchTerm,
+                    ...prevSearchExpression.slice(i + 1),
                   ];
                 });
                 searchTermFinderRef.current?.focus();
@@ -140,6 +141,8 @@ export const PowerSearch: React.FC<PowerSearchProps> = ({
             {
               field: fieldConfig,
               operator: operatorConfig,
+              searchValue:
+                operatorConfig.valueType === 'NO_VALUE' ? null : undefined,
             },
           ]);
         }}