diff --git a/input/tangy-gps.js b/input/tangy-gps.js
index 7ca4e922..e6cd3c8b 100644
--- a/input/tangy-gps.js
+++ b/input/tangy-gps.js
@@ -88,44 +88,60 @@ class TangyGps extends TangyInputBase {
       }
     </style>
     <div class="flex-container m-y-25">
-      <div id="qnum-number"></div>
-      <div id="qnum-content">   
-        <label id="label"></label>
-        <div class="coordinates">
-          <div id="lat-long">
-            <span class="label">[[t.latitude]]:</span> [[currentLatitude]] <br>
-            <span class="label">[[t.longitude]]:</span> [[currentLongitude]] <br>
+  <div id="qnum-number"></div>
+  <div id="qnum-content">
+    <label id="label"></label>
+    <label class="hint-text"></label>
+    <div class="coordinates">
+      <template is="dom-if" if="[[!disabled]]">
+        <div id="lat-long">
+          <span class="label">[[t.latitude]]:</span> [[currentLatitude]] <br>
+          <span class="label">[[t.longitude]]:</span> [[currentLongitude]] <br>
+        </div>
+
+        <template is="dom-if" if="[[currentLatitude]]">
+          <div id="accuracy-distance">
+            <span class="label">[[t.accuracy]]:</span> [[currentAccuracy]] meters<br>
+          </div>
+          <div id="accuracy-level">
+            <span class="label">[[t.accuracyLevel]]:</span> [[accuracyLevel]]
           </div>
+        </template>
 
-          <template is="dom-if" if="[[currentLatitude]]">
-            <div id="accuracy-distance">
-              <span class="label">[[t.accuracy]]:</span> [[currentAccuracy]] meters<br>
-            </div>
-            <div id="accuracy-level">
-              <span class="label">[[t.accuracyLevel]]:</span> [[accuracyLevel]]
-            </div>
-          </template> 
+        <template is="dom-if" if="{{hasDelta}}">
+          <br>
+          <span class="label">[[t.disanceFromReference]]:</span> [[currentDelta]] meters
+        </template>
+        </template>
+    </div>
 
-          <template is="dom-if" if="{{hasDelta}}">
-            <br> 
-            <span class="label">[[t.disanceFromReference]]:</span> [[currentDelta]] meters
-          </template>
+    <div>
+      <template is="dom-if" if="[[!currentLatitude]]">
+          [[t.searching]]...
+      </template>
+      <div class="geofence-message-container">
+        <div class="geofence-message"> [[geofenceMessage]]</div>
+      </div>
+    </div>
+    <div id="error-text"></div>
+    <div id="warn-text"></div>
+    <div id="discrepancy-text"></div>
+    <div>
+    <template is="dom-if" if="{{isDisabledAndHAsValue(disabled, value.latitude)}}">
+      <div id="lat-long">
+          <span class="label">[[t.latitude]]:</span> [[value.latitude]] <br>
+          <span class="label">[[t.longitude]]:</span> [[value.longitude]] <br>
         </div>
 
-        <div>
-          <template is="dom-if" if="[[!currentLatitude]]">
-              [[t.searching]]...
-          </template>
-          <div class="geofence-message-container"> 
-            <div class="geofence-message"> [[geofenceMessage]]</div>
+        <template is="dom-if" if="[[value.accuracy]]">
+          <div id="accuracy-distance">
+            <span class="label">[[t.accuracy]]:</span> [[value.accuracy]] meters<br>
           </div>
-        </div>
-        <label class="hint-text"></label>
-        <div id="error-text"></div>
-        <div id="warn-text"></div>
-        <div id="discrepancy-text"></div>
-      </div>
+        </template>
     </div>
+  </div>
+</div>
+</div>
   `;
   }
 
@@ -421,6 +437,9 @@ class TangyGps extends TangyInputBase {
   _deg2rad(deg) {
     return deg * (Math.PI/180)
   }
+  isDisabledAndHAsValue(disabled, value){
+    return disabled && value
+  }
 }
 
 window.customElements.define(TangyGps.is, TangyGps);
diff --git a/tangy-form-reducer.js b/tangy-form-reducer.js
index f1576033..6687440b 100644
--- a/tangy-form-reducer.js
+++ b/tangy-form-reducer.js
@@ -168,7 +168,7 @@ const tangyFormReducer = function (state = initialState, action) {
             const inputMeta = itemMeta.inputs.find(inputMeta => inputMeta.name === input.name)
             if(action.meta.disableComponents && action.meta.disableComponents.length > 0){
               inputMeta.disabled = action.meta.disableComponents.find(e => e.toLowerCase() === input.tagName.toLowerCase())
-              inputMeta.readOnly = true
+              inputMeta.readOnly = inputMeta.disabled
             }
             return Object.assign({}, input, {disabled: inputMeta ? !!inputMeta.disabled : false, readOnly: inputMeta.readOnly})
           })