diff --git a/src/form-builder-controls.js b/src/form-builder-controls.js
index b9c6fb2d4..c803685b6 100755
--- a/src/form-builder-controls.js
+++ b/src/form-builder-controls.js
@@ -128,7 +128,7 @@ export default [
         readonlyProperty,
         colorProperty,
         bgcolorProperty,
-        defaultValueProperty,
+        // defaultValueProperty,
       ],
     },
   },
diff --git a/src/global-properties.js b/src/global-properties.js
index a820d1a9e..7bb25f99e 100644
--- a/src/global-properties.js
+++ b/src/global-properties.js
@@ -1,3 +1,7 @@
+import {
+  defaultValueProperty,
+} from './form-control-common-properties.js';
+
 export const formTypes = {
   form: 'form',
   display: 'display',
@@ -6,6 +10,15 @@ export const formTypes = {
 export default [
   {
     inspector: [
+      {
+        type: 'EncryptedConfig',
+        field: 'encryptedConfig',
+        config: {
+          label: 'Encrypted',
+          helper: '',
+        },
+      },
+      defaultValueProperty,
       {
         type: 'FormInput',
         field: 'conditionalHide',
@@ -57,14 +70,6 @@ export default [
           validation: 'regex: [0-9]*',
         },
       },
-      {
-        type: 'EncryptedConfig',
-        field: 'encryptedConfig',
-        config: {
-          label: 'Encrypted',
-          helper: '',
-        },
-      },
     ],
   },
 ];