diff --git a/src/CalcViewModel/ApplicationViewModel.h b/src/CalcViewModel/ApplicationViewModel.h
index c35595e..8a293ea 100644
--- a/src/CalcViewModel/ApplicationViewModel.h
+++ b/src/CalcViewModel/ApplicationViewModel.h
@@ -23,10 +23,11 @@ namespace CalculatorApp
             OBSERVABLE_PROPERTY_RW(DateCalculatorViewModel ^, DateCalcViewModel);
             OBSERVABLE_PROPERTY_RW(UnitConverterViewModel ^, ConverterViewModel);
             OBSERVABLE_PROPERTY_RW(CalculatorApp::Common::ViewMode, PreviousMode);
+            OBSERVABLE_PROPERTY_R(bool, IsAlwaysOnTop);
             OBSERVABLE_NAMED_PROPERTY_RW(Platform::String ^, CategoryName);
 
             // Indicates whether calculator is currently in standard mode _and_ supports CompactOverlay _and_ is not in Always-on-Top mode
-            OBSERVABLE_PROPERTY_RW(bool, DisplayNormalAlwaysOnTopOption);
+            OBSERVABLE_PROPERTY_R(bool, DisplayNormalAlwaysOnTopOption);
 
             COMMAND_FOR_METHOD(CopyCommand, ApplicationViewModel::OnCopyCommand);
             COMMAND_FOR_METHOD(PasteCommand, ApplicationViewModel::OnPasteCommand);
@@ -91,22 +92,6 @@ namespace CalculatorApp
                 }
             }
 
-            property bool IsAlwaysOnTop
-            {
-                bool get()
-                {
-                    return m_isAlwaysOnTop;
-                }
-                void set(bool value)
-                {
-                    if (m_isAlwaysOnTop != value)
-                    {
-                        m_isAlwaysOnTop = value;
-                        RaisePropertyChanged(L"IsAlwaysOnTop");
-                    }
-                }
-            }
-
             void ToggleAlwaysOnTop(float width, float height);
 
         private:
@@ -123,8 +108,6 @@ namespace CalculatorApp
             Windows::Foundation::Collections::IObservableVector<CalculatorApp::Common::NavCategoryGroup ^> ^ m_categories;
             Concurrency::task<void> HandleToggleAlwaysOnTop(float width, float height);
             void SetDisplayNormalAlwaysOnTopOption();
-
-            bool m_isAlwaysOnTop;
         };
     }
 }
diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml
index ca372ea..a275e9c 100644
--- a/src/Calculator/Views/MainPage.xaml
+++ b/src/Calculator/Views/MainPage.xaml
@@ -86,9 +86,9 @@
                     Command="{x:Bind Model.PasteCommand}"/>
         </StackPanel>
 
-        <local:TitleBar x:Name="CustomTitleBar" Grid.Row="0"
-                        ApplicationViewModel="{x:Bind Model}"/>
-        
+        <local:TitleBar Grid.Row="0" IsAlwaysOnTopMode="{x:Bind Model.IsAlwaysOnTop, Mode=OneWay}"
+                        AlwaysOnTopClick="TitleBarAlwaysOnTopButtonClick"/>
+
         <Grid Grid.Row="1">
             <Border x:Name="CalcHolder">
                 <!-- PLACEHOLDER!!!! This is where the calculator goes when it is delay loaded -->
diff --git a/src/Calculator/Views/MainPage.xaml.cpp b/src/Calculator/Views/MainPage.xaml.cpp
index 61d00bf..74a79e1 100644
--- a/src/Calculator/Views/MainPage.xaml.cpp
+++ b/src/Calculator/Views/MainPage.xaml.cpp
@@ -546,7 +546,13 @@ void MainPage::OnNavItemInvoked(MUXC::NavigationView ^ /*sender*/, _In_ MUXC::Na
     NavView->IsPaneOpen = false;
 }
 
-void MainPage::AlwaysOnTopButtonClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
+void MainPage::TitleBarAlwaysOnTopButtonClick(_In_ Object ^ /*sender*/, _In_ RoutedEventArgs ^ /*e*/)
+{
+    auto bounds = Window::Current->Bounds;
+    Model->ToggleAlwaysOnTop(bounds.Width, bounds.Height);
+}
+
+void MainPage::AlwaysOnTopButtonClick(_In_ Object ^ /*sender*/, _In_ RoutedEventArgs ^ /*e*/)
 {
     Model->ToggleAlwaysOnTop(0, 0);
 }
diff --git a/src/Calculator/Views/MainPage.xaml.h b/src/Calculator/Views/MainPage.xaml.h
index 3f16cd3..c7a2e98 100644
--- a/src/Calculator/Views/MainPage.xaml.h
+++ b/src/Calculator/Views/MainPage.xaml.h
@@ -57,6 +57,7 @@ public
         void OnAboutFlyoutOpened(_In_ Platform::Object ^ sender, _In_ Platform::Object ^ e);
         void OnAboutFlyoutClosed(_In_ Platform::Object ^ sender, _In_ Platform::Object ^ e);
         void AlwaysOnTopButtonClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
+        void TitleBarAlwaysOnTopButtonClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
 
         Microsoft::UI::Xaml::Controls::NavigationViewItemHeader ^ CreateNavViewHeaderFromGroup(CalculatorApp::Common::NavCategoryGroup ^ group);
         Microsoft::UI::Xaml::Controls::NavigationViewItem ^ CreateNavViewItemFromCategory(CalculatorApp::Common::NavCategory ^ category);
diff --git a/src/Calculator/Views/TitleBar.xaml b/src/Calculator/Views/TitleBar.xaml
index 1c7615f..94d13fa 100644
--- a/src/Calculator/Views/TitleBar.xaml
+++ b/src/Calculator/Views/TitleBar.xaml
@@ -3,11 +3,7 @@
              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:converters="using:CalculatorApp.Converters"
              mc:Ignorable="d">
-    <UserControl.Resources>
-        <converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter"/>
-    </UserControl.Resources>
     <Grid x:Name="LayoutRoot"
           Height="32"
           HorizontalAlignment="Stretch">
@@ -20,37 +16,44 @@
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
+            <VisualStateGroup x:Name="AOTStates">
+                <VisualState x:Name="AOTNormalState"/>
+                <VisualState x:Name="AOTMiniState">
+                    <VisualState.Setters>
+                        <Setter Target="AppName.Visibility" Value="Collapsed"/>
+                        <Setter Target="ExitAlwaysOnTopButton.Visibility" Value="Visible"/>
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
         <Grid x:Name="BackgroundElement"
-              Background="Transparent"
-              Height="32">
+              Height="32"
+              Background="Transparent">
             <TextBlock x:Name="AppName"
-                   x:Uid="AppName"
-                   Margin="12,0,12,0"
-                   HorizontalAlignment="Left"
-                   VerticalAlignment="Center"
-                   Foreground="{ThemeResource TitleBarForegroundBaseHighBrush}"
-                   FontSize="12"
-                   TextAlignment="Left"
-                   TextTrimming="CharacterEllipsis"
-                   Visibility="{x:Bind ApplicationViewModel.IsAlwaysOnTop, Converter={StaticResource BooleanToVisibilityNegationConverter}, Mode=OneWay}"/>
+                       x:Uid="AppName"
+                       Margin="12,0,12,0"
+                       HorizontalAlignment="Left"
+                       VerticalAlignment="Center"
+                       Foreground="{ThemeResource TitleBarForegroundBaseHighBrush}"
+                       FontSize="12"
+                       TextAlignment="Left"
+                       TextTrimming="CharacterEllipsis"/>
         </Grid>
-        <Button x:Name="AoTAlwaysOnTopButton"
+        <Button x:Name="ExitAlwaysOnTopButton"
                 x:Uid="ExitAlwaysOnTopButton"
-                Grid.Row="0"
-                FontFamily="{StaticResource CalculatorFontFamily}"
-                Style="{ThemeResource CommandBarFlyoutEllipsisButtonStyle}"
-                Content="&#xEE47;"
-                Click="AlwaysOnTopButtonClick"
                 Width="46"
-                Height="32"
+                Height="Auto"
                 HorizontalAlignment="Left"
                 HorizontalContentAlignment="Center"
+                Style="{ThemeResource CommandBarFlyoutEllipsisButtonStyle}"
                 Background="Transparent"
-                FontWeight="Thin"
+                FontFamily="{StaticResource CalculatorFontFamily}"
                 FontSize="14"
-                AllowFocusWhenDisabled="False"
-                Visibility="{x:Bind ApplicationViewModel.IsAlwaysOnTop, Mode=OneWay}"
-                AutomationProperties.AutomationId="AoTAlwaysOnTopButton"/>
+                FontWeight="Thin"
+                x:Load="False"
+                AutomationProperties.AutomationId="ExitAlwaysOnTopButton"
+                Click="AlwaysOnTopButton_Click"
+                Content="&#xEE47;"
+                Visibility="Collapsed"/>
     </Grid>
 </UserControl>
diff --git a/src/Calculator/Views/TitleBar.xaml.cpp b/src/Calculator/Views/TitleBar.xaml.cpp
index c4dcb95..6b8ab4d 100644
--- a/src/Calculator/Views/TitleBar.xaml.cpp
+++ b/src/Calculator/Views/TitleBar.xaml.cpp
@@ -22,7 +22,7 @@ using namespace Concurrency;
 
 namespace CalculatorApp
 {
-    DEPENDENCY_PROPERTY_INITIALIZATION(TitleBar, ApplicationViewModel);
+    DEPENDENCY_PROPERTY_INITIALIZATION(TitleBar, IsAlwaysOnTopMode);
 
     TitleBar::TitleBar()
         : m_coreTitleBar(CoreApplication::GetCurrentView()->TitleBar)
@@ -40,7 +40,7 @@ namespace CalculatorApp
         AppName->Text = AppResourceProvider::GetInstance().GetResourceString(L"AppName");
 #else
         AppName->Text = AppResourceProvider::GetInstance().GetResourceString(L"DevAppName");
-#endif //IS_STORE_BUILD
+#endif // IS_STORE_BUILD
     }
 
     void TitleBar::OnLoaded(_In_ Object ^ /*sender*/, _In_ RoutedEventArgs ^ /*e*/)
@@ -82,10 +82,9 @@ namespace CalculatorApp
         m_windowActivatedToken.Value = 0;
     }
 
-
     void TitleBar::SetTitleBarVisibility()
     {
-        this->LayoutRoot->Visibility = m_coreTitleBar->IsVisible || ApplicationViewModel->IsAlwaysOnTop ? ::Visibility::Visible : ::Visibility::Collapsed;
+        this->LayoutRoot->Visibility = m_coreTitleBar->IsVisible || IsAlwaysOnTopMode ? ::Visibility::Visible : ::Visibility::Collapsed;
     }
 
     void TitleBar::SetTitleBarPadding()
@@ -173,9 +172,14 @@ namespace CalculatorApp
             this, e->WindowActivationState == CoreWindowActivationState::Deactivated ? WindowNotFocused->Name : WindowFocused->Name, false);
     }
 
-    void TitleBar::AlwaysOnTopButtonClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
+    void TitleBar::OnIsAlwaysOnTopModePropertyChanged(bool /*oldValue*/, bool newValue)
     {
-        auto bounds = Window::Current->Bounds;
-        ApplicationViewModel->ToggleAlwaysOnTop(bounds.Width, bounds.Height);
+        SetTitleBarVisibility();
+        VisualStateManager::GoToState(this, newValue ? "AOTMiniState" : "AOTNormalState", false);
+    }
+
+    void TitleBar::AlwaysOnTopButton_Click(_In_ Object ^ /*sender*/, _In_ RoutedEventArgs ^ e)
+    {
+        AlwaysOnTopClick(this, e);
     }
 }
diff --git a/src/Calculator/Views/TitleBar.xaml.h b/src/Calculator/Views/TitleBar.xaml.h
index ae5e2d6..53bf6ff 100644
--- a/src/Calculator/Views/TitleBar.xaml.h
+++ b/src/Calculator/Views/TitleBar.xaml.h
@@ -20,8 +20,9 @@ public
         TitleBar();
 
         DEPENDENCY_PROPERTY_OWNER(TitleBar);
-        DEPENDENCY_PROPERTY(ViewModel::ApplicationViewModel ^, ApplicationViewModel);
+        DEPENDENCY_PROPERTY_WITH_CALLBACK(bool, IsAlwaysOnTopMode);
 
+        event Windows::UI::Xaml::RoutedEventHandler ^ AlwaysOnTopClick;
     private:
         void OnLoaded(_In_ Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
         void OnUnloaded(_In_ Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
@@ -33,6 +34,7 @@ public
         void ColorValuesChanged(_In_ Windows::UI::ViewManagement::UISettings ^ sender, _In_ Platform::Object ^ e);
         void OnHighContrastChanged(Windows::UI::ViewManagement::AccessibilitySettings ^ sender, Platform::Object ^ args);
         void OnWindowActivated(Platform::Object ^ sender, Windows::UI::Core::WindowActivatedEventArgs ^ e);
+        void OnIsAlwaysOnTopModePropertyChanged(bool oldValue, bool newValue);
 
         Platform::Agile<Windows::ApplicationModel::Core::CoreApplicationViewTitleBar ^> m_coreTitleBar;
         Windows::Foundation::EventRegistrationToken m_layoutChangedToken;
@@ -42,6 +44,6 @@ public
         Windows::Foundation::EventRegistrationToken m_accessibilitySettingsToken;
         Windows::UI::ViewManagement::UISettings ^ m_uiSettings;
         Windows::UI::ViewManagement::AccessibilitySettings ^ m_accessibilitySettings;
-        void AlwaysOnTopButtonClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
+        void AlwaysOnTopButton_Click(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
     };
 }