diff --git a/Wallet.Avalonia/CreateWalletView.axaml b/Wallet.Avalonia/CreateWalletView.axaml
index d3c6216..22a7ae2 100644
--- a/Wallet.Avalonia/CreateWalletView.axaml
+++ b/Wallet.Avalonia/CreateWalletView.axaml
@@ -7,21 +7,24 @@
     x:DataType="vm:CreateWalletViewModel"
     CloseButtonText="Cancel"
     IsPrimaryButtonEnabled="{Binding !Active}"
+    IsSecondaryButtonEnabled="{Binding !Active}"
     PrimaryButtonText="Create">
-    <StackPanel Width="400">
-        <TextBox
-            Margin="0,0,0,18"
-            Text="{Binding Name}"
-            Watermark="Enter Wallet name" />
-        <TextBox
-            Margin="0,0,0,18"
-            Classes="revealPasswordButton"
-            PasswordChar="&#x25CF;"
-            Text="{Binding Password}"
-            Watermark="Enter password" />
-        <TextBox
-            Classes="revealPasswordButton"
-            PasswordChar="&#x25CF;"
-            Watermark="Confirm password" />
-    </StackPanel>
+    <Grid>
+        <StackPanel Width="400" IsEnabled="{Binding !Active}">
+            <TextBox
+                Margin="0,0,0,18"
+                Text="{Binding Name}"
+                Watermark="Enter Wallet name" />
+            <TextBox
+                Margin="0,0,0,18"
+                Classes="revealPasswordButton"
+                PasswordChar="&#x25CF;"
+                Text="{Binding Password}"
+                Watermark="Enter password" />
+            <TextBox
+                Classes="revealPasswordButton"
+                PasswordChar="&#x25CF;"
+                Watermark="Confirm password" />
+        </StackPanel>
+    </Grid>
 </ContentDialog>
diff --git a/Wallet/CreateWalletViewModel.cs b/Wallet/CreateWalletViewModel.cs
index ad9b672..8e30f79 100644
--- a/Wallet/CreateWalletViewModel.cs
+++ b/Wallet/CreateWalletViewModel.cs
@@ -1,5 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
+using System.Reactive.Disposables;
 using Toolkit.Foundation;
 
 namespace Wallet;
@@ -21,7 +22,7 @@ public partial class CreateWalletViewModel(IServiceProvider provider,
     [ObservableProperty]
     private string password;
 
-    public async Task<bool> Confirm()
+    public async Task<bool> ConfirmPrimary()
     {
         using (await new ActivityLock(this))
         {