diff --git a/Layout/default/Building/Form.php b/Layout/default/Building/Form.php
index dc967e2e7..20e32613a 100644
--- a/Layout/default/Building/Form.php
+++ b/Layout/default/Building/Form.php
@@ -122,14 +122,14 @@
                       <div class="form-group row">
                         <label class="col-lg-4 col-form-label" for="gps_lat">GPS Länge (N)</label>
                         <div class="col-lg-8">
-                          <input type="text" class="form-control" name="gps_lat" id="gps_lat" value="<?=$building->gps_lat?>" <?=($building->id) ? "readonly='readonly'" : ""?> />
+                          <input type="text" class="form-control" name="gps_lat" id="gps_lat" value="<?=$building->gps_lat?>" <?=($building->gps_lat) ? "readonly='readonly'" : ""?> />
                         </div>
                       </div>
 
                       <div class="form-group row">
                         <label class="col-lg-4 col-form-label" for="gps_long">GPS Breite (E)</label>
                         <div class="col-lg-8">
-                          <input type="text" class="form-control" name="gps_long" id="gps_long" value="<?=$building->gps_long?>" <?=($building->id) ? "readonly='readonly'" : ""?> />
+                          <input type="text" class="form-control" name="gps_long" id="gps_long" value="<?=$building->gps_long?>" <?=($building->gps_lat) ? "readonly='readonly'" : ""?> />
                         </div>
                       </div>
                       
@@ -350,6 +350,7 @@
   function enableGpsInputs() {
     $("#gps_lat").removeAttr("readonly");
     $("#gps_long").removeAttr("readonly");
+    $("#edit-gps").remove();
   }