diff --git a/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx b/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx
index d7a6c6f244..fee38f9bc9 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx
@@ -3,7 +3,6 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useState } from 'react';
-import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
 import { TooltipHost } from 'office-ui-fabric-react/lib/Tooltip';
 import { SharedColors, NeutralColors, FontSizes } from '@uifabric/fluent-theme';
@@ -16,6 +15,7 @@ import { FieldLabel } from '../FieldLabel';
 import { arrayField } from './styles';
 import { ArrayFieldItem } from './ArrayFieldItem';
 import { UnsupportedField } from './UnsupportedField';
+import { WrappedTextField } from './WrappedTextField';
 
 const ArrayField: React.FC<FieldProps<unknown[]>> = (props) => {
   const {
@@ -79,7 +79,7 @@ const ArrayField: React.FC<FieldProps<unknown[]>> = (props) => {
       </div>
       <div css={arrayField.inputFieldContainer}>
         <div css={arrayField.field}>
-          <TextField
+          <WrappedTextField
             ariaLabel={formatMessage('New value')}
             data-testid="string-array-text-input"
             iconProps={{
diff --git a/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx b/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx
index 623a3c29d1..66cc8031cf 100644
--- a/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx
@@ -2,11 +2,13 @@
 // Licensed under the MIT License.
 
 import React, { useState, useEffect } from 'react';
-import { TextField, ITextFieldStyles } from 'office-ui-fabric-react/lib/TextField';
+import { ITextFieldStyles } from 'office-ui-fabric-react/lib/TextField';
 import { NeutralColors } from '@uifabric/fluent-theme';
 import { mergeStyleSets } from '@uifabric/styling';
 import { FieldProps } from '@bfc/extension-client';
 
+import { WrappedTextField } from './WrappedTextField';
+
 interface EditableFieldProps extends Omit<FieldProps, 'definitions'> {
   fontSize?: string;
   styles?: Partial<ITextFieldStyles>;
@@ -64,7 +66,7 @@ const EditableField: React.FC<EditableFieldProps> = (props) => {
       onMouseEnter={() => setEditing(true)}
       onMouseLeave={() => !hasFocus && setEditing(false)}
     >
-      <TextField
+      <WrappedTextField
         ariaLabel={ariaLabel}
         autoComplete="off"
         errorMessage={error as string}
diff --git a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
index bddc4a630d..6298220f2f 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
@@ -4,10 +4,10 @@
 import { FieldProps, useShellApi } from '@bfc/extension-client';
 import { IntellisenseTextField } from '@bfc/intellisense';
 import { Icon } from 'office-ui-fabric-react/lib/Icon';
-import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import React from 'react';
 
 import { getIntellisenseUrl } from '../../../utils/getIntellisenseUrl';
+import { WrappedTextField } from '../WrappedTextField';
 
 const ExpressionEditor: React.FC<FieldProps> = (props) => {
   const { id, value = '', onChange, disabled, placeholder, readonly, error } = props;
@@ -24,7 +24,7 @@ const ExpressionEditor: React.FC<FieldProps> = (props) => {
       onChange={onChange}
     >
       {(textFieldValue, onValueChanged, onKeyDownTextField, onKeyUpTextField, onClickTextField) => (
-        <TextField
+        <WrappedTextField
           autoComplete="off"
           disabled={disabled}
           errorMessage={error}
diff --git a/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx b/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
index 3445d49aed..c86e627511 100644
--- a/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
@@ -3,12 +3,13 @@
 
 import { FieldProps } from '@bfc/extension-client';
 import { IntellisenseTextField } from '@bfc/intellisense';
-import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import React from 'react';
 
 import { getIntellisenseUrl } from '../../utils/getIntellisenseUrl';
 import { FieldLabel } from '../FieldLabel';
 
+import { WrappedTextField } from './WrappedTextField';
+
 export const IntellisenseField: React.FC<FieldProps<string>> = function IntellisenseField(props) {
   const { id, value = '', onChange, label, description, uiOptions, required } = props;
 
@@ -24,7 +25,7 @@ export const IntellisenseField: React.FC<FieldProps<string>> = function Intellis
         onChange={onChange}
       >
         {(textFieldValue, onValueChanged, onKeyDownTextField, onKeyUpTextField, onClickTextField) => (
-          <TextField
+          <WrappedTextField
             autoComplete="off"
             id={id}
             value={textFieldValue}
diff --git a/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx b/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
index 169c0a7ef9..c091e9e8b9 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
@@ -8,7 +8,7 @@ import { FieldProps, useShellApi } from '@bfc/extension-client';
 import { DefaultButton } from 'office-ui-fabric-react/lib/Button';
 import { JSONSchema7 } from 'json-schema';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
-import { TextField, ITextField } from 'office-ui-fabric-react/lib/TextField';
+import { ITextField } from 'office-ui-fabric-react/lib/TextField';
 import { TooltipHost } from 'office-ui-fabric-react/lib/Tooltip';
 import { FontSizes, NeutralColors, SharedColors } from '@uifabric/fluent-theme';
 import formatMessage from 'format-message';
@@ -20,6 +20,7 @@ import { FieldLabel } from '../FieldLabel';
 import { objectArrayField } from './styles';
 import { ArrayFieldItem } from './ArrayFieldItem';
 import { UnsupportedField } from './UnsupportedField';
+import { WrappedTextField } from './WrappedTextField';
 
 const getNewPlaceholder = (props: FieldProps<any[]>, propertyName: string): string | undefined => {
   const { uiOptions } = props;
@@ -152,7 +153,7 @@ const ObjectArrayField: React.FC<FieldProps<any[]>> = (props) => {
                   if (typeof property === 'string') {
                     return (
                       <div key={index} css={objectArrayField.objectItemInputField}>
-                        <TextField
+                        <WrappedTextField
                           ariaLabel={lastField ? END_OF_ROW_LABEL : INSIDE_ROW_LABEL}
                           autoComplete="off"
                           componentRef={index === 0 ? firstNewFieldRef : undefined}
diff --git a/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx b/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx
index 1f7a9aad0f..90c6f2a465 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import React from 'react';
+import React, { useRef } from 'react';
 import { FieldProps } from '@bfc/extension-client';
 
 import { getOrderedProperties } from '../../utils';
@@ -8,6 +8,8 @@ import { FormRow } from '../FormRow';
 
 const ObjectField: React.FC<FieldProps<object>> = function ObjectField(props) {
   const { schema, uiOptions, depth, value, label, ...rest } = props;
+  const valueRef = useRef(value);
+  valueRef.current = value;
 
   if (!schema) {
     return null;
@@ -16,7 +18,7 @@ const ObjectField: React.FC<FieldProps<object>> = function ObjectField(props) {
   const newDepth = depth + 1;
 
   const handleChange = (field: string) => (data: any) => {
-    const newData = { ...value };
+    const newData = { ...valueRef.current };
 
     if (typeof data === 'undefined' || (typeof data === 'string' && data.length === 0)) {
       delete newData[field];
diff --git a/Composer/packages/adaptive-form/src/components/fields/StringField.tsx b/Composer/packages/adaptive-form/src/components/fields/StringField.tsx
index 2ffbbc4bce..5c569fb5ea 100644
--- a/Composer/packages/adaptive-form/src/components/fields/StringField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/StringField.tsx
@@ -4,11 +4,12 @@
 import React from 'react';
 import { FieldProps } from '@bfc/extension-client';
 import { NeutralColors } from '@uifabric/fluent-theme';
-import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import formatMessage from 'format-message';
 
 import { FieldLabel } from '../FieldLabel';
 
+import { WrappedTextField } from './WrappedTextField';
+
 export const borderStyles = (transparentBorder: boolean, error: boolean) =>
   transparentBorder
     ? {
@@ -63,7 +64,7 @@ export const StringField: React.FC<FieldProps<string>> = function StringField(pr
   return (
     <>
       <FieldLabel description={description} helpLink={uiOptions?.helpLink} id={id} label={label} required={required} />
-      <TextField
+      <WrappedTextField
         ariaLabel={label || formatMessage('string field')}
         disabled={disabled}
         errorMessage={error}
diff --git a/Composer/packages/adaptive-form/src/components/fields/WrappedTextField.tsx b/Composer/packages/adaptive-form/src/components/fields/WrappedTextField.tsx
new file mode 100644
index 0000000000..ee116c43b9
--- /dev/null
+++ b/Composer/packages/adaptive-form/src/components/fields/WrappedTextField.tsx
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { TextField, ITextFieldProps } from 'office-ui-fabric-react/lib/TextField';
+import React from 'react';
+
+export class WrappedTextField extends React.Component<ITextFieldProps> {
+  shouldComponentUpdate(nextProps: ITextFieldProps) {
+    if (this.props.value === nextProps.value) {
+      return false;
+    }
+
+    return true;
+  }
+
+  render() {
+    return <TextField {...this.props} />;
+  }
+}