diff --git a/src/OneWare.GhdlExtension/ViewModels/GhdlSimulatorToolbarViewModel.cs b/src/OneWare.GhdlExtension/ViewModels/GhdlSimulatorToolbarViewModel.cs
index af68bc6..b80446f 100644
--- a/src/OneWare.GhdlExtension/ViewModels/GhdlSimulatorToolbarViewModel.cs
+++ b/src/OneWare.GhdlExtension/ViewModels/GhdlSimulatorToolbarViewModel.cs
@@ -89,4 +89,25 @@ public string AdditionalGhdlSimOptions
         }
     }
 
+    public string GtkwSaveFile
+    {
+        get => context.GetBenchProperty(nameof(GtkwSaveFile)) ?? "";
+        set
+        {
+            if (string.IsNullOrWhiteSpace(value)) context.RemoveBenchProperty(nameof(GtkwSaveFile));
+            else context.SetBenchProperty(nameof(GtkwSaveFile), value);
+            OnPropertyChanged();
+        }
+    }
+
+    public string GtkwWaveArgs
+    {
+        get => context.GetBenchProperty(nameof(GtkwWaveArgs)) ?? "";
+        set
+        {
+            if (string.IsNullOrWhiteSpace(value)) context.RemoveBenchProperty(nameof(GtkwWaveArgs));
+            else context.SetBenchProperty(nameof(GtkwWaveArgs), value);
+            OnPropertyChanged();
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/OneWare.GhdlExtension/Views/GhdlSimulatorToolbarView.axaml b/src/OneWare.GhdlExtension/Views/GhdlSimulatorToolbarView.axaml
index 9cadf56..f5c55a1 100644
--- a/src/OneWare.GhdlExtension/Views/GhdlSimulatorToolbarView.axaml
+++ b/src/OneWare.GhdlExtension/Views/GhdlSimulatorToolbarView.axaml
@@ -19,6 +19,14 @@
                             <TextBlock Text="Additional GHDL Simulation Options"/>
                             <TextBox Text="{Binding AdditionalGhdlSimOptions}" />
                         </StackPanel>
+						<StackPanel Orientation="Vertical" Spacing="2">
+							<TextBlock Text="GTKWave Save File"/>
+							<TextBox Text="{Binding GtkwSaveFile}" />
+						</StackPanel>
+						<StackPanel Orientation="Vertical" Spacing="2">
+							<TextBlock Text="Additional GTKWave Arguments"/>
+							<TextBox Text="{Binding GtkwWaveArgs}" />
+						</StackPanel>
                     </StackPanel>
                 </Flyout>
             </Button.Flyout>