diff --git a/app/components/object-inspector/property.ts b/app/components/object-inspector/property.ts
index 82181b625c..5009d7dd34 100644
--- a/app/components/object-inspector/property.ts
+++ b/app/components/object-inspector/property.ts
@@ -122,7 +122,7 @@ export default class ObjectInspectorProperty extends Component<ObjectInspectorPr
 
   get cannotEdit() {
     if (this.args.model.name === '...' || !this.isCalculated || this.readOnly) return true;
-    return this.args.model?.value?.type !== 'type-string' && this.args.model?.value?.type !== 'type-number';
+    return !['type-string', 'type-number', 'type-boolean'].includes(this.args.model?.value?.type);
   }
 
   @action
diff --git a/tests/acceptance/object-inspector-test.js b/tests/acceptance/object-inspector-test.js
index 6ac43bbe41..408422130b 100644
--- a/tests/acceptance/object-inspector-test.js
+++ b/tests/acceptance/object-inspector-test.js
@@ -1006,6 +1006,67 @@ module('Object Inspector', function (hooks) {
     assert.dom('[data-test-object-property-value]').hasText(date.toString());
   });
 
+  test('Boolean fields are editable', async function (assert) {
+    assert.expect(4);
+
+    await visit('/');
+
+    await sendMessage({
+      type: 'objectInspector:updateObject',
+      name: 'My Object',
+      objectId: 'myObject',
+      details: [
+        {
+          name: 'First Detail',
+          expand: false,
+          properties: [
+            {
+              name: 'booleanProperty',
+              value: {
+                inspect: true.toString(),
+                type: 'type-boolean',
+                isCalculated: true,
+              },
+            },
+          ],
+        },
+      ],
+    });
+
+    respondWith(
+      'objectInspector:saveProperty',
+      ({ objectId, property, value }) => {
+        assert.strictEqual(typeof value, 'boolean', 'sent as boolean');
+
+        return {
+          type: 'objectInspector:updateProperty',
+          objectId,
+          property,
+          mixinIndex: 0,
+          value: {
+            inspect: false.toString(),
+            type: 'type-boolean',
+            isCalculated: false,
+          },
+        };
+      }
+    );
+
+    await click('[data-test-object-detail-name]');
+
+    assert.dom('[data-test-object-property-value]').hasText(true.toString());
+
+    await click('[data-test-object-property-value]');
+
+    let field = find('[data-test-object-property-value-txt]');
+    assert.ok(field);
+
+    await fillIn(field, 'false');
+    await triggerKeyEvent(field, 'keyup', 13);
+
+    assert.dom('[data-test-object-property-value]').hasText(false.toString());
+  });
+
   test('Errors are correctly displayed', async function (assert) {
     assert.expect(8);