diff --git a/src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs b/src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs
index f86e9a501..726129f12 100644
--- a/src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs
@@ -80,6 +80,9 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
     [ObservableProperty]
     public partial Settings Settings { get; private set; }
 
+    [ObservableProperty]
+    public partial bool IsMarkdownViewerVisible { get; set; }
+
     [RelayCommand]
     internal async Task RefreshAsync()
     {
@@ -374,6 +377,7 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
         this.SetInfoStatus("Prêt.");
         Settings = settings ?? new Settings();
         SearchText = Settings.SearchText;
+        IsMarkdownViewerVisible = false;
         WindowTitle = "PostIt";
         DraftTitle = string.Empty;
         DraftArticle = string.Empty;
diff --git a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs
index 35d5a59fe..1c2802e33 100644
--- a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs
+++ b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs
@@ -33,6 +33,9 @@ public partial class Settings : ViewModelBase
     [ObservableProperty]
     public partial string SearchText { get; set; } = string.Empty;
 
+    [ObservableProperty]
+    public partial bool IsMarkdownViewerVisible { get; set; } = false;
+
     [ObservableProperty]
     public partial string ProviderOngoingRequestsSortOption { get; set; } = string.Empty;
 
diff --git a/src/PostIt/PostIt/Views/Blogs/BlogsPage.axaml b/src/PostIt/PostIt/Views/Blogs/BlogsPage.axaml
index d4124a651..cb63ed6d3 100644
--- a/src/PostIt/PostIt/Views/Blogs/BlogsPage.axaml
+++ b/src/PostIt/PostIt/Views/Blogs/BlogsPage.axaml
@@ -7,6 +7,7 @@
              xmlns:models="using:Yavsc.Blogspot"
              xmlns:views="using:PostIt.Views.Blogs"
              xmlns:AvaloniaEdit="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
+             xmlns:md="using:MarkdownViewer.Core.Controls"
              mc:Ignorable="d"
              x:Class="PostIt.Views.Blogs.BlogsPage"
              x:DataType="vm:BlogsViewModel"
@@ -21,6 +22,8 @@
   Padding="5"
   Margin="5"
       >
+
+
   <StackPanel HorizontalAlignment="Stretch">
     <StackPanel Orientation="Horizontal" Spacing="10" Margin="5">
       <TextBlock Text="Blog Posts" FontSize="20" FontWeight="SemiBold" />
@@ -70,6 +73,12 @@
             <PathIcon Data="{StaticResource PublishedIcon}" />
           </CommandBarToggleButton.Icon>
         </CommandBarToggleButton>
+        <CommandBarToggleButton Label="Markdown Viewer"
+                                IsChecked="{Binding IsMarkdownViewerVisible, Mode=TwoWay}">
+          <CommandBarToggleButton.Icon>
+            <PathIcon Data="{StaticResource MarkdownIcon}" />
+          </CommandBarToggleButton.Icon>
+        </CommandBarToggleButton>
         <CommandBarButton x:Name="OpenSignatureDevButton"
                           Label="[DEV] Signature" Command="{Binding OpenSignatureDevAsync}">
           <CommandBarButton.Icon>
@@ -85,15 +94,12 @@
           <RowDefinition Height="*" />
           <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <WrapPanel Grid.Row="0" ItemSpacing="10">
-
-        </WrapPanel>
         <Border Grid.Row="1" BorderBrush="Gray" BorderThickness="1" Padding="8">
           <ListBox ItemsSource="{Binding FilteredPosts}"
                    SelectedItem="{Binding SelectedPost, Mode=TwoWay}">
             <ListBox.ItemTemplate>
               <DataTemplate x:DataType="models:BlogPostDto">
-                <StackPanel Spacing="4">
+                <StackPanel Spacing="4" >
                   <TextBlock Text="{Binding Title}" FontWeight="SemiBold" />
                   <TextBlock Text="{Binding DateModified, StringFormat='Updated: {0:yyyy-MM-dd HH:mm}'}" FontSize="10" Foreground="Gray" />
                   <TextBlock Text="{Binding AuthorId}" FontSize="10" Foreground="DarkSlateGray" />
@@ -103,12 +109,16 @@
           </ListBox>
         </Border>
 
-        <Border Grid.Row="2" BorderBrush="Gray" BorderThickness="1" Padding="8">
+        <md:MarkdownViewer Grid.Row="2" Name="MarkdownViewer"
+          IsVisible="{Binding IsMarkdownViewerVisible}"
+          MarkdownText="{Binding DraftArticle}" />
+
+        <Border Grid.Row="2" BorderBrush="Gray" BorderThickness="1" Padding="8"
+              IsVisible="{Binding !IsMarkdownViewerVisible}">
           <Grid RowSpacing="10"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
             <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
               <RowDefinition Height="Auto" />
               <RowDefinition Height="Auto" />
               <RowDefinition Height="*" />