diff --git a/packages/react-devtools-shared/src/devtools/views/Components/EditableValue.js b/packages/react-devtools-shared/src/devtools/views/Components/EditableValue.js
index 96f505c20f188..c196a8d83b74e 100644
--- a/packages/react-devtools-shared/src/devtools/views/Components/EditableValue.js
+++ b/packages/react-devtools-shared/src/devtools/views/Components/EditableValue.js
@@ -16,6 +16,7 @@ import {useEditableValue} from '../hooks';
 type OverrideValueFn = (path: Array<string | number>, value: any) => void;
 
 type EditableValueProps = {|
+  className?: string,
   dataType: string,
   initialValue: any,
   overrideValueFn: OverrideValueFn,
@@ -23,6 +24,7 @@ type EditableValueProps = {|
 |};
 
 export default function EditableValue({
+  className = '',
   dataType,
   initialValue,
   overrideValueFn,
@@ -74,7 +76,7 @@ export default function EditableValue({
     <Fragment>
       <input
         autoComplete="new-password"
-        className={isValid ? styles.Input : styles.Invalid}
+        className={`${isValid ? styles.Input : styles.Invalid} ${className}`}
         onChange={handleChange}
         onKeyDown={handleKeyDown}
         placeholder={placeholder}
diff --git a/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.css b/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.css
index 76c1e40761019..4547a814d0524 100644
--- a/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.css
+++ b/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.css
@@ -53,3 +53,7 @@
   display: flex;
   align-items: center;
 }
+
+.EditableValue {
+  min-width: 1rem;
+}
diff --git a/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.js b/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.js
index edfb5f2c5679e..9c81c3f952fdb 100644
--- a/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.js
+++ b/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.js
@@ -82,7 +82,7 @@ export default function InspectedElementTree({
             </Button>
           )}
         </div>
-        {isEmpty && <div className={styles.Empty}>None</div>}
+        {isEmpty && !canAddEntries && <div className={styles.Empty}>None</div>}
         {!isEmpty &&
           (entries: any).map(([name, value]) => (
             <KeyValue
@@ -104,6 +104,7 @@ export default function InspectedElementTree({
             />
             :&nbsp;
             <EditableValue
+              className={styles.EditableValue}
               initialValue={''}
               overrideValueFn={handleNewEntryValue}
               path={[newPropName]}
diff --git a/packages/react-devtools-shared/src/devtools/views/Components/SelectedElement.js b/packages/react-devtools-shared/src/devtools/views/Components/SelectedElement.js
index 46af47c1d7773..08d15104ec8e5 100644
--- a/packages/react-devtools-shared/src/devtools/views/Components/SelectedElement.js
+++ b/packages/react-devtools-shared/src/devtools/views/Components/SelectedElement.js
@@ -358,7 +358,7 @@ function InspectedElementView({
         inspectPath={inspectPropsPath}
         overrideValueFn={overridePropsFn}
         showWhenEmpty={true}
-        canAddEntries={true}
+        canAddEntries={typeof overridePropsFn === 'function'}
       />
       {type === ElementTypeSuspense ? (
         <InspectedElementTree