diff --git a/KeyVaultExplorer/Services/VaultService.cs b/KeyVaultExplorer/Services/VaultService.cs
index af146bc..0f6857f 100644
--- a/KeyVaultExplorer/Services/VaultService.cs
+++ b/KeyVaultExplorer/Services/VaultService.cs
@@ -357,4 +357,12 @@ public async Task<SecretProperties> UpdateSecret(SecretProperties properties, Ur
         var client = new SecretClient(KeyVaultUri, token);
         return await client.UpdateSecretPropertiesAsync(properties);
     }
+
+    public async Task<CertificateProperties> UpdateCertificate(CertificateProperties properties, Uri KeyVaultUri)
+    {
+        var token = new CustomTokenCredential(await _authService.GetAzureKeyVaultTokenSilent());
+        var client = new CertificateClient(KeyVaultUri, token);
+        var response = await client.UpdateCertificatePropertiesAsync(properties);
+        return response.Value.Properties;
+    }
 }
\ No newline at end of file
diff --git a/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs b/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
index e6bdd7a..194314d 100644
--- a/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
+++ b/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
@@ -4,6 +4,7 @@
 using KeyVaultExplorer.Services;
 using KeyVaultExplorer.Validations;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
@@ -64,6 +65,9 @@ public CreateNewSecretVersionViewModel()
         ValidateAllProperties();
     }
 
+    // Delegate to get updated tags from the UI
+    public Func<IDictionary<string, string>>? GetUpdatedTags { get; set; }
+
     [ObservableProperty]
     public bool hasActivationDateChecked;
 
@@ -86,6 +90,9 @@ public async Task EditDetails()
         else
             KeyVaultSecretModel.ExpiresOn = null;
 
+        // Update tags from the TagsEditor if available
+        UpdateTagsFromEditor();
+
         var updatedProps = await _vaultService.UpdateSecret(KeyVaultSecretModel, KeyVaultSecretModel.VaultUri);
         KeyVaultSecretModel = updatedProps;
     }
@@ -102,6 +109,9 @@ private async Task NewVersion()
 
         newSecret.Properties.ContentType = KeyVaultSecretModel.ContentType;
 
+        // Update tags from the TagsEditor before creating new version
+        UpdateTagsFromEditor();
+
         foreach (var tag in KeyVaultSecretModel.Tags)
             newSecret.Properties.Tags.Add(tag.Key, tag.Value);
 
@@ -137,6 +147,19 @@ partial void OnHasExpirationDateCheckedChanged(bool oldValue, bool newValue)
         }
     }
 
+    private void UpdateTagsFromEditor()
+    {
+        if (GetUpdatedTags != null)
+        {
+            var updatedTags = GetUpdatedTags();
+            KeyVaultSecretModel.Tags.Clear();
+            foreach (var tag in updatedTags)
+            {
+                KeyVaultSecretModel.Tags[tag.Key] = tag.Value;
+            }
+        }
+    }
+
     //public async Task<ObservableCollection<SubscriptionDataItem>> GetAvailableSubscriptions()
     //{
     //    var subscriptions = new List<SubscriptionDataItem>();
diff --git a/KeyVaultExplorer/ViewModels/EditCertificateVersionViewModel.cs b/KeyVaultExplorer/ViewModels/EditCertificateVersionViewModel.cs
new file mode 100644
index 0000000..4871cd7
--- /dev/null
+++ b/KeyVaultExplorer/ViewModels/EditCertificateVersionViewModel.cs
@@ -0,0 +1,96 @@
+using Azure.Security.KeyVault.Certificates;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using KeyVaultExplorer.Services;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace KeyVaultExplorer.ViewModels;
+
+public partial class EditCertificateVersionViewModel : ViewModelBase
+{
+    private readonly AuthService _authService;
+    private readonly VaultService _vaultService;
+    private readonly NotificationViewModel _notificationViewModel;
+
+    [ObservableProperty]
+    private TimeSpan? expiresOnTimespan;
+
+    [ObservableProperty]
+    private bool isBusy = false;
+
+    [ObservableProperty]
+    private CertificateProperties keyVaultCertificateModel = new CertificateProperties("");
+
+    [ObservableProperty]
+    private TimeSpan? notBeforeTimespan;
+
+    [ObservableProperty]
+    public bool hasActivationDateChecked;
+
+    [ObservableProperty]
+    public bool hasExpirationDateChecked;
+
+    public EditCertificateVersionViewModel()
+    {
+        _authService = Defaults.Locator.GetRequiredService<AuthService>();
+        _vaultService = Defaults.Locator.GetRequiredService<VaultService>();
+        _notificationViewModel = Defaults.Locator.GetRequiredService<NotificationViewModel>();
+    }
+
+    // Delegate to get updated tags from the UI
+    public Func<IDictionary<string, string>>? GetUpdatedTags { get; set; }
+
+    public string? Identifier => KeyVaultCertificateModel?.Id?.ToString();
+    public string? Location => KeyVaultCertificateModel?.VaultUri.ToString();
+
+    [RelayCommand]
+    public async Task EditDetails()
+    {
+        // For certificates, we can only update tags and enabled status
+        // Date properties are typically managed by the certificate lifecycle
+        
+        // Update tags from the TagsEditor if available
+        UpdateTagsFromEditor();
+
+        var updatedCert = await _vaultService.UpdateCertificate(KeyVaultCertificateModel, KeyVaultCertificateModel.VaultUri);
+        KeyVaultCertificateModel = updatedCert;
+    }
+
+    private void UpdateTagsFromEditor()
+    {
+        if (GetUpdatedTags != null)
+        {
+            var updatedTags = GetUpdatedTags();
+            KeyVaultCertificateModel.Tags.Clear();
+            foreach (var tag in updatedTags)
+            {
+                KeyVaultCertificateModel.Tags[tag.Key] = tag.Value;
+            }
+        }
+    }
+
+    partial void OnKeyVaultCertificateModelChanging(CertificateProperties value)
+    {
+        if (value != null)
+        {
+            HasActivationDateChecked = value.NotBefore.HasValue;
+            HasExpirationDateChecked = value.ExpiresOn.HasValue;
+            ExpiresOnTimespan = value.ExpiresOn.HasValue ? value.ExpiresOn.Value.LocalDateTime.TimeOfDay : null;
+            NotBeforeTimespan = value.NotBefore.HasValue ? value.NotBefore.Value.LocalDateTime.TimeOfDay : null;
+        }
+    }
+
+    partial void OnHasActivationDateCheckedChanged(bool oldValue, bool newValue)
+    {
+        // Certificate dates are usually managed automatically
+        // This might not be applicable for certificates
+    }
+
+    partial void OnHasExpirationDateCheckedChanged(bool oldValue, bool newValue)
+    {
+        // Certificate dates are usually managed automatically  
+        // This might not be applicable for certificates
+    }
+}
\ No newline at end of file
diff --git a/KeyVaultExplorer/ViewModels/EditKeyVersionViewModel.cs b/KeyVaultExplorer/ViewModels/EditKeyVersionViewModel.cs
new file mode 100644
index 0000000..4fb0abd
--- /dev/null
+++ b/KeyVaultExplorer/ViewModels/EditKeyVersionViewModel.cs
@@ -0,0 +1,107 @@
+using Azure.Security.KeyVault.Keys;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using KeyVaultExplorer.Services;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace KeyVaultExplorer.ViewModels;
+
+public partial class EditKeyVersionViewModel : ViewModelBase
+{
+    private readonly AuthService _authService;
+    private readonly VaultService _vaultService;
+    private readonly NotificationViewModel _notificationViewModel;
+
+    [ObservableProperty]
+    private TimeSpan? expiresOnTimespan;
+
+    [ObservableProperty]
+    private bool isBusy = false;
+
+    [ObservableProperty]
+    private KeyProperties keyVaultKeyModel = new KeyProperties("");
+
+    [ObservableProperty]
+    private TimeSpan? notBeforeTimespan;
+
+    [ObservableProperty]
+    public bool hasActivationDateChecked;
+
+    [ObservableProperty]
+    public bool hasExpirationDateChecked;
+
+    public EditKeyVersionViewModel()
+    {
+        _authService = Defaults.Locator.GetRequiredService<AuthService>();
+        _vaultService = Defaults.Locator.GetRequiredService<VaultService>();
+        _notificationViewModel = Defaults.Locator.GetRequiredService<NotificationViewModel>();
+    }
+
+    // Delegate to get updated tags from the UI
+    public Func<IDictionary<string, string>>? GetUpdatedTags { get; set; }
+
+    public string? Identifier => KeyVaultKeyModel?.Id?.ToString();
+    public string? Location => KeyVaultKeyModel?.VaultUri.ToString();
+
+    [RelayCommand]
+    public async Task EditDetails()
+    {
+        if (KeyVaultKeyModel.NotBefore.HasValue && HasActivationDateChecked)
+            KeyVaultKeyModel.NotBefore = KeyVaultKeyModel.NotBefore.Value.Date + (NotBeforeTimespan ?? TimeSpan.Zero);
+        else
+            KeyVaultKeyModel.NotBefore = null;
+
+        if (KeyVaultKeyModel.ExpiresOn.HasValue && HasExpirationDateChecked)
+            KeyVaultKeyModel.ExpiresOn = KeyVaultKeyModel.ExpiresOn.Value.Date + (ExpiresOnTimespan ?? TimeSpan.Zero);
+        else
+            KeyVaultKeyModel.ExpiresOn = null;
+
+        // Update tags from the TagsEditor if available
+        UpdateTagsFromEditor();
+
+        var updatedKey = await _vaultService.UpdateKey(KeyVaultKeyModel, KeyVaultKeyModel.VaultUri);
+        KeyVaultKeyModel = updatedKey.Properties;
+    }
+
+    private void UpdateTagsFromEditor()
+    {
+        if (GetUpdatedTags != null)
+        {
+            var updatedTags = GetUpdatedTags();
+            KeyVaultKeyModel.Tags.Clear();
+            foreach (var tag in updatedTags)
+            {
+                KeyVaultKeyModel.Tags[tag.Key] = tag.Value;
+            }
+        }
+    }
+
+    partial void OnKeyVaultKeyModelChanging(KeyProperties value)
+    {
+        if (value != null)
+        {
+            HasActivationDateChecked = value.NotBefore.HasValue;
+            HasExpirationDateChecked = value.ExpiresOn.HasValue;
+            ExpiresOnTimespan = value.ExpiresOn.HasValue ? value.ExpiresOn.Value.LocalDateTime.TimeOfDay : null;
+            NotBeforeTimespan = value.NotBefore.HasValue ? value.NotBefore.Value.LocalDateTime.TimeOfDay : null;
+        }
+    }
+
+    partial void OnHasActivationDateCheckedChanged(bool oldValue, bool newValue)
+    {
+        if (newValue is false)
+        {
+            KeyVaultKeyModel.NotBefore = null;
+        }
+    }
+
+    partial void OnHasExpirationDateCheckedChanged(bool oldValue, bool newValue)
+    {
+        if (newValue is false)
+        {
+            KeyVaultKeyModel.ExpiresOn = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs b/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
index 070c740..a3002c3 100644
--- a/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
+++ b/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
@@ -238,6 +238,72 @@ private async Task EditVersion()
                     DataContext = viewModel
                 };
             }
+            else if (IsKey)
+            {
+                var currentItem = KeyPropertiesList.OrderByDescending(x => x.CreatedOn).First();
+                var viewModel = new EditKeyVersionViewModel();
+
+                viewModel.KeyVaultKeyModel = currentItem;
+                dialog.PrimaryButtonClick += async (sender, args) =>
+                {
+                    var def = args.GetDeferral();
+                    try
+                    {
+                        await viewModel.EditDetailsCommand.ExecuteAsync(null);
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification("Success", "The key properties have been updated."));
+                    }
+                    catch (KeyVaultInsufficientPrivilegesException ex)
+                    {
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+                    }
+                    catch (Exception ex)
+                    {
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+                    }
+                    finally
+                    {
+                        def.Complete();
+                    }
+                };
+
+                dialog.Content = new EditKeyVersion()
+                {
+                    DataContext = viewModel
+                };
+            }
+            else if (IsCertificate)
+            {
+                var currentItem = CertificatePropertiesList.OrderByDescending(x => x.CreatedOn).First();
+                var viewModel = new EditCertificateVersionViewModel();
+
+                viewModel.KeyVaultCertificateModel = currentItem;
+                dialog.PrimaryButtonClick += async (sender, args) =>
+                {
+                    var def = args.GetDeferral();
+                    try
+                    {
+                        await viewModel.EditDetailsCommand.ExecuteAsync(null);
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification("Success", "The certificate properties have been updated."));
+                    }
+                    catch (KeyVaultInsufficientPrivilegesException ex)
+                    {
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+                    }
+                    catch (Exception ex)
+                    {
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+                    }
+                    finally
+                    {
+                        def.Complete();
+                    }
+                };
+
+                dialog.Content = new EditCertificateVersion()
+                {
+                    DataContext = viewModel
+                };
+            }
             var result = await dialog.ShowAsync();
         }
         catch (KeyVaultItemNotFoundException ex)
diff --git a/KeyVaultExplorer/Views/CustomControls/TagsEditor.axaml b/KeyVaultExplorer/Views/CustomControls/TagsEditor.axaml
new file mode 100644
index 0000000..0a1e1d9
--- /dev/null
+++ b/KeyVaultExplorer/Views/CustomControls/TagsEditor.axaml
@@ -0,0 +1,61 @@
+<UserControl
+    x:Class="KeyVaultExplorer.Views.CustomControls.TagsEditor"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:FluentAvalonia.UI.Controls"
+    xmlns:controls="using:KeyVaultExplorer.Views.CustomControls"
+    d:DesignHeight="300"
+    d:DesignWidth="500"
+    x:DataType="controls:TagsEditor"
+    mc:Ignorable="d">
+
+    <StackPanel Orientation="Vertical" Spacing="10">
+        <TextBlock Text="Tags" FontWeight="SemiBold" />
+        
+        <!-- Tags List -->
+        <ItemsControl Name="TagsItemsControl" ItemsSource="{Binding Tags}">
+            <ItemsControl.ItemTemplate>
+                <DataTemplate x:DataType="controls:TagItem">
+                    <Border
+                        Background="{DynamicResource SystemFillColorNeutralBackgroundBrush}"
+                        BorderBrush="{DynamicResource SystemFillColorNeutralBorderBrush}"
+                        BorderThickness="1"
+                        CornerRadius="4"
+                        Margin="0,2"
+                        Padding="8">
+                        <Grid ColumnDefinitions="*,*,Auto">
+                            <TextBox
+                                Grid.Column="0"
+                                Text="{Binding Key, Mode=TwoWay}"
+                                Watermark="Key"
+                                Margin="0,0,5,0" />
+                            <TextBox
+                                Grid.Column="1"
+                                Text="{Binding Value, Mode=TwoWay}"
+                                Watermark="Value"
+                                Margin="5,0,5,0" />
+                            <Button
+                                Grid.Column="2"
+                                Content="×"
+                                FontSize="16"
+                                Width="24"
+                                Height="24"
+                                Padding="0"
+                                Click="RemoveTag_Click"
+                                Tag="{Binding}" />
+                        </Grid>
+                    </Border>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+        
+        <!-- Add New Tag Button -->
+        <Button
+            Name="AddTagButton"
+            Content="+ Add Tag"
+            HorizontalAlignment="Left"
+            Click="AddTag_Click" />
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/KeyVaultExplorer/Views/CustomControls/TagsEditor.axaml.cs b/KeyVaultExplorer/Views/CustomControls/TagsEditor.axaml.cs
new file mode 100644
index 0000000..8301f7c
--- /dev/null
+++ b/KeyVaultExplorer/Views/CustomControls/TagsEditor.axaml.cs
@@ -0,0 +1,98 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace KeyVaultExplorer.Views.CustomControls;
+
+public partial class TagsEditor : UserControl
+{
+    private ObservableCollection<TagItem> _tags = new();
+
+    public TagsEditor()
+    {
+        InitializeComponent();
+        DataContext = this;
+    }
+
+    public ObservableCollection<TagItem> Tags
+    {
+        get => _tags;
+        set => _tags = value;
+    }
+
+    public IDictionary<string, string> TagsDictionary
+    {
+        get
+        {
+            var dict = new Dictionary<string, string>();
+            foreach (var tag in Tags)
+            {
+                if (!string.IsNullOrWhiteSpace(tag.Key) && !string.IsNullOrWhiteSpace(tag.Value))
+                {
+                    dict[tag.Key] = tag.Value;
+                }
+            }
+            return dict;
+        }
+        set
+        {
+            Tags.Clear();
+            if (value != null)
+            {
+                foreach (var kvp in value)
+                {
+                    Tags.Add(new TagItem { Key = kvp.Key, Value = kvp.Value });
+                }
+            }
+        }
+    }
+
+    private void AddTag_Click(object? sender, RoutedEventArgs e)
+    {
+        Tags.Add(new TagItem { Key = "", Value = "" });
+    }
+
+    private void RemoveTag_Click(object? sender, RoutedEventArgs e)
+    {
+        if (sender is Button button && button.Tag is TagItem tagItem)
+        {
+            Tags.Remove(tagItem);
+        }
+    }
+}
+
+public class TagItem : INotifyPropertyChanged
+{
+    private string _key = "";
+    private string _value = "";
+
+    public string Key
+    {
+        get => _key;
+        set
+        {
+            _key = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public string Value
+    {
+        get => _value;
+        set
+        {
+            _value = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}
\ No newline at end of file
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml
index 5414079..45c9de4 100644
--- a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml
+++ b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml
@@ -8,6 +8,7 @@
     xmlns:models="clr-namespace:KeyVaultExplorer.Models;assembly=KeyVaultExplorer"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
     xmlns:vm="clr-namespace:KeyVaultExplorer.ViewModels"
+    xmlns:controls="using:KeyVaultExplorer.Views.CustomControls"
     d:DesignHeight="450"
     d:DesignWidth="600"
     x:DataType="vm:CreateNewSecretVersionViewModel"
@@ -127,6 +128,12 @@
                 <TextBlock VerticalAlignment="Center" Text="Secret Content type (optional)" />
                 <TextBox Classes.IsSmall="True" Text="{Binding KeyVaultSecretModel.ContentType}" />
             </StackPanel>
+
+            <!-- Tags Editor Section -->
+            <StackPanel Orientation="Vertical" Spacing="5">
+                <controls:TagsEditor Name="TagsEditor" />
+            </StackPanel>
+
             <StackPanel
                 IsVisible="{Binding !IsEdit}"
                 Orientation="Vertical"
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml.cs b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml.cs
index 9a21905..313b5ad 100644
--- a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml.cs
+++ b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using KeyVaultExplorer.ViewModels;
+using System.ComponentModel;
 
 namespace KeyVaultExplorer;
 
@@ -10,6 +11,25 @@ public CreateNewSecretVersion()
         InitializeComponent();
         var vm = new CreateNewSecretVersionViewModel();
         DataContext = vm;
+        
+        // Wire up the delegate to get tags from the TagsEditor
+        vm.GetUpdatedTags = () => TagsEditor.TagsDictionary;
+        
+        // Subscribe to ViewModel property changes to sync tags
+        vm.PropertyChanged += OnViewModelPropertyChanged;
+    }
+
+    private void OnViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(CreateNewSecretVersionViewModel.KeyVaultSecretModel) && 
+            DataContext is CreateNewSecretVersionViewModel vm)
+        {
+            // Update TagsEditor when KeyVaultSecretModel changes
+            if (vm.KeyVaultSecretModel?.Tags != null)
+            {
+                TagsEditor.TagsDictionary = vm.KeyVaultSecretModel.Tags;
+            }
+        }
     }
 
     //private void Subscription_SelectionChanged(object? sender, Avalonia.Controls.SelectionChangedEventArgs e)
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditCertificateVersion.axaml b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditCertificateVersion.axaml
new file mode 100644
index 0000000..6f3e8e8
--- /dev/null
+++ b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditCertificateVersion.axaml
@@ -0,0 +1,61 @@
+<UserControl
+    x:Class="KeyVaultExplorer.EditCertificateVersion"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:FluentAvalonia.UI.Controls"
+    xmlns:vm="clr-namespace:KeyVaultExplorer.ViewModels"
+    xmlns:controls="using:KeyVaultExplorer.Views.CustomControls"
+    d:DesignHeight="450"
+    d:DesignWidth="600"
+    x:DataType="vm:EditCertificateVersionViewModel"
+    mc:Ignorable="d">
+
+    <ScrollViewer
+        MinWidth="400"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Stretch">
+
+        <StackPanel
+            Margin="10"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch"
+            Orientation="Vertical">
+
+            <StackPanel Orientation="Vertical" Spacing="5">
+                <TextBlock Text="Certificate Name" />
+                <TextBox IsEnabled="False" Text="{Binding KeyVaultCertificateModel.Name}" />
+            </StackPanel>
+
+            <StackPanel Orientation="Vertical" Spacing="5">
+                <TextBlock Text="Vault Location" />
+                <TextBox IsEnabled="False" Text="{Binding KeyVaultCertificateModel.VaultUri}" />
+            </StackPanel>
+
+            <StackPanel>
+                <TextBlock Text="Activation Date (Read-only)" />
+                <TextBox IsEnabled="False" Text="{Binding KeyVaultCertificateModel.NotBefore}" />
+                
+                <TextBlock Text="Expiration Date (Read-only)" />
+                <TextBox IsEnabled="False" Text="{Binding KeyVaultCertificateModel.ExpiresOn}" />
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal" Spacing="5">
+                <TextBlock
+                    Margin="0,4,0,0"
+                    VerticalAlignment="Center"
+                    Text="Enabled" />
+                <ToggleSwitch
+                    IsChecked="{Binding KeyVaultCertificateModel.Enabled}"
+                    OffContent="No"
+                    OnContent="Yes" />
+            </StackPanel>
+
+            <!-- Tags Editor Section -->
+            <StackPanel Orientation="Vertical" Spacing="5">
+                <controls:TagsEditor Name="TagsEditor" />
+            </StackPanel>
+        </StackPanel>
+    </ScrollViewer>
+</UserControl>
\ No newline at end of file
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditCertificateVersion.axaml.cs b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditCertificateVersion.axaml.cs
new file mode 100644
index 0000000..bd91099
--- /dev/null
+++ b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditCertificateVersion.axaml.cs
@@ -0,0 +1,47 @@
+using Avalonia.Controls;
+using KeyVaultExplorer.ViewModels;
+using System;
+using System.ComponentModel;
+
+namespace KeyVaultExplorer;
+
+public partial class EditCertificateVersion : UserControl
+{
+    public EditCertificateVersion()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnDataContextChanged(EventArgs e)
+    {
+        base.OnDataContextChanged(e);
+        
+        if (DataContext is EditCertificateVersionViewModel vm)
+        {
+            // Wire up the delegate to get tags from the TagsEditor
+            vm.GetUpdatedTags = () => TagsEditor.TagsDictionary;
+            
+            // Subscribe to ViewModel property changes to sync tags
+            vm.PropertyChanged += OnViewModelPropertyChanged;
+            
+            // Initialize tags if KeyVaultCertificateModel is already set
+            if (vm.KeyVaultCertificateModel?.Tags != null)
+            {
+                TagsEditor.TagsDictionary = vm.KeyVaultCertificateModel.Tags;
+            }
+        }
+    }
+
+    private void OnViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(EditCertificateVersionViewModel.KeyVaultCertificateModel) && 
+            DataContext is EditCertificateVersionViewModel vm)
+        {
+            // Update TagsEditor when KeyVaultCertificateModel changes
+            if (vm.KeyVaultCertificateModel?.Tags != null)
+            {
+                TagsEditor.TagsDictionary = vm.KeyVaultCertificateModel.Tags;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditKeyVersion.axaml b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditKeyVersion.axaml
new file mode 100644
index 0000000..0c8d429
--- /dev/null
+++ b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditKeyVersion.axaml
@@ -0,0 +1,85 @@
+<UserControl
+    x:Class="KeyVaultExplorer.EditKeyVersion"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:FluentAvalonia.UI.Controls"
+    xmlns:vm="clr-namespace:KeyVaultExplorer.ViewModels"
+    xmlns:controls="using:KeyVaultExplorer.Views.CustomControls"
+    d:DesignHeight="450"
+    d:DesignWidth="600"
+    x:DataType="vm:EditKeyVersionViewModel"
+    mc:Ignorable="d">
+
+    <ScrollViewer
+        MinWidth="400"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Stretch">
+
+        <StackPanel
+            Margin="10"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch"
+            Orientation="Vertical">
+
+            <StackPanel Orientation="Vertical" Spacing="5">
+                <TextBlock Text="Key Name" />
+                <TextBox IsEnabled="False" Text="{Binding KeyVaultKeyModel.Name}" />
+            </StackPanel>
+
+            <StackPanel Orientation="Vertical" Spacing="5">
+                <TextBlock Text="Vault Location" />
+                <TextBox IsEnabled="False" Text="{Binding KeyVaultKeyModel.VaultUri}" />
+            </StackPanel>
+
+            <StackPanel>
+                <CheckBox
+                    Name="SetActivationDateCheckbox"
+                    IsChecked="{Binding HasActivationDateChecked}"
+                    ToolTip.Tip="Sets when this key will become active. This sets the 'nbf' property on the key.">
+                    Set Activation Date
+                </CheckBox>
+                <StackPanel
+                    IsVisible="{Binding #SetActivationDateCheckbox.IsChecked}"
+                    Orientation="Vertical"
+                    Spacing="5">
+                    <DatePicker
+                        MinWidth="400"
+                        HorizontalAlignment="Left"
+                        SelectedDate="{Binding KeyVaultKeyModel.NotBefore}" />
+                    <TimePicker MinWidth="400" SelectedTime="{Binding NotBeforeTimespan}" />
+                </StackPanel>
+                <CheckBox
+                    Name="SetExpirationDateCheckbox"
+                    IsChecked="{Binding HasExpirationDateChecked}"
+                    ToolTip.Tip="Sets when this key will become inactive. This sets the 'exp' property on the key.">
+                    Set Expiration Date
+                </CheckBox>
+                <StackPanel
+                    IsVisible="{Binding #SetExpirationDateCheckbox.IsChecked}"
+                    Orientation="Vertical"
+                    Spacing="5">
+                    <DatePicker MinWidth="400" SelectedDate="{Binding KeyVaultKeyModel.ExpiresOn}" />
+                    <TimePicker MinWidth="400" SelectedTime="{Binding ExpiresOnTimespan, Mode=TwoWay}" />
+                </StackPanel>
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal" Spacing="5">
+                <TextBlock
+                    Margin="0,4,0,0"
+                    VerticalAlignment="Center"
+                    Text="Enabled" />
+                <ToggleSwitch
+                    IsChecked="{Binding KeyVaultKeyModel.Enabled}"
+                    OffContent="No"
+                    OnContent="Yes" />
+            </StackPanel>
+
+            <!-- Tags Editor Section -->
+            <StackPanel Orientation="Vertical" Spacing="5">
+                <controls:TagsEditor Name="TagsEditor" />
+            </StackPanel>
+        </StackPanel>
+    </ScrollViewer>
+</UserControl>
\ No newline at end of file
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditKeyVersion.axaml.cs b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditKeyVersion.axaml.cs
new file mode 100644
index 0000000..340188b
--- /dev/null
+++ b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/EditKeyVersion.axaml.cs
@@ -0,0 +1,47 @@
+using Avalonia.Controls;
+using KeyVaultExplorer.ViewModels;
+using System;
+using System.ComponentModel;
+
+namespace KeyVaultExplorer;
+
+public partial class EditKeyVersion : UserControl
+{
+    public EditKeyVersion()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnDataContextChanged(EventArgs e)
+    {
+        base.OnDataContextChanged(e);
+        
+        if (DataContext is EditKeyVersionViewModel vm)
+        {
+            // Wire up the delegate to get tags from the TagsEditor
+            vm.GetUpdatedTags = () => TagsEditor.TagsDictionary;
+            
+            // Subscribe to ViewModel property changes to sync tags
+            vm.PropertyChanged += OnViewModelPropertyChanged;
+            
+            // Initialize tags if KeyVaultKeyModel is already set
+            if (vm.KeyVaultKeyModel?.Tags != null)
+            {
+                TagsEditor.TagsDictionary = vm.KeyVaultKeyModel.Tags;
+            }
+        }
+    }
+
+    private void OnViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(EditKeyVersionViewModel.KeyVaultKeyModel) && 
+            DataContext is EditKeyVersionViewModel vm)
+        {
+            // Update TagsEditor when KeyVaultKeyModel changes
+            if (vm.KeyVaultKeyModel?.Tags != null)
+            {
+                TagsEditor.TagsDictionary = vm.KeyVaultKeyModel.Tags;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml b/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml
index 36dd879..3ab4d58 100644
--- a/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml
+++ b/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml
@@ -86,7 +86,6 @@
                         Command="{Binding EditVersionCommand}"
                         IconSource="Edit"
                         IsEnabled="{Binding !IsManaged}"
-                        IsVisible="{Binding IsSecret}"
                         Label="Edit"
                         ToolTip.Tip="Edit Current Version"
                         ToolTip.VerticalOffset="10" />