diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php
index ee19bae42..baf8cfabe 100644
--- a/Layout/default/Linework/Index.php
+++ b/Layout/default/Linework/Index.php
@@ -337,11 +337,11 @@
 
                           <tr>
                             <td colspan="3">
-                              <label class="form-label">Kommentar Tiefbau (<?=$term->building->street?>)</label>
+                              <label class="form-label" for="workflow_comment_building_<?=$term->id?>">Kommentar Tiefbau (<?=$term->building->street?>)</label>
                               <textarea class="form-control" style="height:100%" form="wf-termination-<?=$term->id?>" name="workflow_comment_building" id="workflow_comment_building_<?=$term->id?>"><?=$term->building->workflow_comment?></textarea>
                             </td>
                             <td colspan="3">
-                              <label class="form-label">Kommentar Anschluss (<?=$term->code?>)</label>
+                              <label class="form-label" for="workflow_comment_<?=$term->id?>">Kommentar Anschluss (<?=$term->code?>)</label>
                               <textarea class="form-control" style="height:100%" form="wf-termination-<?=$term->id?>" name="workflow_comment" id="workflow_comment_<?=$term->id?>"><?=$term->workflow_comment?></textarea>
                             </td>
                             <td colspan="<?=$wfColspan - 3?>">
@@ -437,8 +437,9 @@ $(document).ready(function() {
   var match = hash.match(/object=(\d+)/);
   if(match && match[1]) {
     term = match[1]
-    var pos = $('#termination-' + term).offset().top;
-    $(window).scrollTop(pos - 150 );
+    togglePipework(term);
+    var pos = $('#termination-' + term + "-summary").offset().top;
+    $(window).scrollTop(pos - 182);
   }
   
   $('input[name=wfitemplaceholder_customer_passive_finished]').each(function() {