diff --git a/frontend/src/_ui/Sort/index.js b/frontend/src/_ui/Sort/index.js
index 2edf03c643..323d9d26e5 100644
--- a/frontend/src/_ui/Sort/index.js
+++ b/frontend/src/_ui/Sort/index.js
@@ -26,14 +26,9 @@ export default ({
   }
 
   function keyValuePairValueChanged(value, keyIndex, index) {
-    if (!isRenderedAsQueryEditor) {
-      const newOptions = deepClone(options);
-      newOptions[index][keyIndex] = value;
-      options.length - 1 === index ? addNewKeyValuePair(newOptions) : optionchanged(getter, newOptions);
-    } else {
-      options[index][keyIndex] = value;
-      optionchanged(getter, options);
-    }
+    const newOptions = deepClone(options);
+    newOptions[index][keyIndex] = value;
+    options.length - 1 === index ? addNewKeyValuePair(newOptions) : optionchanged(getter, newOptions);
   }
 
   const commonProps = {