diff --git a/projects/common/models/elements/geometry/geometry.ts b/projects/common/models/elements/geometry/geometry.ts
index 22093c0a0575d43a20bfa15255a6f686adc42b1d..f0d79c6a37a0f4b92839c5a973556184e959485b 100644
--- a/projects/common/models/elements/geometry/geometry.ts
+++ b/projects/common/models/elements/geometry/geometry.ts
@@ -17,7 +17,7 @@ export class GeometryElement extends UIElement implements PositionedUIElement, G
   appDefinition: string = '';
   showResetIcon: boolean = true;
   enableUndoRedo: boolean = true;
-  showToolbar: boolean = true;
+  showToolbar: boolean = false;
   enableShiftDragZoom: boolean = true;
   showZoomButtons: boolean = true;
   showFullscreenButton: boolean = true;
diff --git a/projects/editor/src/app/components/properties-panel/model-properties-tab/element-model-properties.component.html b/projects/editor/src/app/components/properties-panel/model-properties-tab/element-model-properties.component.html
index e334bdecfe525ff3b05ddebe6354b2e3d4fce800..ea423009fd0008cd86d8fc4e32d14241b531ae5b 100644
--- a/projects/editor/src/app/components/properties-panel/model-properties-tab/element-model-properties.component.html
+++ b/projects/editor/src/app/components/properties-panel/model-properties-tab/element-model-properties.component.html
@@ -190,6 +190,11 @@
     </button>
   </mat-form-field>
 
+  <mat-checkbox *ngIf="combinedProperties.showToolbar !== undefined"
+                [checked]="$any(combinedProperties.showToolbar)"
+                (change)="updateModel.emit({ property: 'showToolbar', value: $event.checked })">
+    {{'propertiesPanel.showToolbar' | translate }}
+  </mat-checkbox>
   <mat-checkbox *ngIf="combinedProperties.showResetIcon !== undefined"
                 [checked]="$any(combinedProperties.showResetIcon)"
                 (change)="updateModel.emit({ property: 'showResetIcon', value: $event.checked })">
@@ -200,11 +205,6 @@
                 (change)="updateModel.emit({ property: 'enableUndoRedo', value: $event.checked })">
     {{'propertiesPanel.enableUndoRedo' | translate }}
   </mat-checkbox>
-  <mat-checkbox *ngIf="combinedProperties.showToolbar !== undefined"
-                [checked]="$any(combinedProperties.showToolbar)"
-                (change)="updateModel.emit({ property: 'showToolbar', value: $event.checked })">
-    {{'propertiesPanel.showToolbar' | translate }}
-  </mat-checkbox>
   <mat-checkbox *ngIf="combinedProperties.enableShiftDragZoom !== undefined"
                 [checked]="$any(combinedProperties.enableShiftDragZoom)"
                 (change)="updateModel.emit({ property: 'enableShiftDragZoom', value: $event.checked })">
diff --git a/projects/editor/src/assets/i18n/de.json b/projects/editor/src/assets/i18n/de.json
index 59862a7b87164c0ccbee035dda4f6a5ab70d6d3d..d503677856d690d13e1946b677ae5559b1eaf5fc 100644
--- a/projects/editor/src/assets/i18n/de.json
+++ b/projects/editor/src/assets/i18n/de.json
@@ -220,7 +220,8 @@
     "hasBorderRight": "Kante rechts",
     "showResetIcon": "Zurücksetzen-Knopf anzeigen",
     "enableUndoRedo": "Schritt rückgängig/wiederherstellen",
-    "showToolbar": "Werkzeugleiste anzeigen",
+    "appDefinition": "GGB-Definition",
+    "showToolbar": "Werkzeugleiste (muss in GGB aktiviert sein)",
     "showZoomButtons": "Zoom-Knöpfe anzeigen",
     "showFullscreenButton": "Vollbild-Knopf anzeigen",
     "enableShiftDragZoom": "Bewegen und Zoom erlauben",