diff --git a/src/components/_classes/component/Component.js b/src/components/_classes/component/Component.js
index 05dfb83227..e03c56d624 100644
--- a/src/components/_classes/component/Component.js
+++ b/src/components/_classes/component/Component.js
@@ -211,7 +211,12 @@ export default class Component extends Element {
     return {
       operators: ['isEqual', 'isNotEqual', 'isEmpty', 'isNotEmpty'],
       valueComponent() {
-        return { type: 'textfield' };
+        return {
+          type: 'textfield',
+          widget: {
+            type: 'input'
+          }
+        };
       }
     };
   }
diff --git a/src/components/textfield/TextField.js b/src/components/textfield/TextField.js
index 22f82c1f12..08871db25b 100644
--- a/src/components/textfield/TextField.js
+++ b/src/components/textfield/TextField.js
@@ -44,6 +44,12 @@ export default class TextFieldComponent extends Input {
     return {
       ...super.conditionOperatorsSettings,
       operators: [...super.conditionOperatorsSettings.operators, 'includes', 'notIncludes', 'endsWith', 'startsWith'],
+      valueComponent(classComp) {
+        return {
+          ...classComp,
+          type: 'textfield',
+        };
+      }
     };
   }