diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml b/src/PlanViewer.App/Controls/QuerySessionControl.axaml
index a6fa92c..a9aefad 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml
@@ -8,7 +8,19 @@
         <Border Grid.Row="0" Background="{DynamicResource BackgroundDarkBrush}" Padding="8,6"
                 BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
             <DockPanel>
-                <StackPanel Orientation="Horizontal" DockPanel.Dock="Left" Spacing="4">
+                <TextBlock x:Name="StatusText" DockPanel.Dock="Right"
+                           HorizontalAlignment="Right" VerticalAlignment="Center"
+                           FontSize="11" Foreground="{DynamicResource ForegroundBrush}"
+                           TextTrimming="CharacterEllipsis" Margin="8,0,0,0"/>
+                <WrapPanel Orientation="Horizontal">
+                    <WrapPanel.Styles>
+                        <Style Selector="Button">
+                            <Setter Property="Margin" Value="0,2,4,2"/>
+                        </Style>
+                        <Style Selector="ComboBox">
+                            <Setter Property="Margin" Value="0,2,4,2"/>
+                        </Style>
+                    </WrapPanel.Styles>
                     <Button x:Name="ConnectButton" Content="Connect" Click="Connect_Click"
                             Height="28" Padding="8,0" FontSize="12"
                             Theme="{StaticResource AppButton}"
@@ -84,11 +96,7 @@
                             Height="28" Padding="10,0" FontSize="12"
                             Theme="{StaticResource AppButton}"
                             ToolTip.Tip="Configure SQL formatting options"/>
-                </StackPanel>
-                <TextBlock x:Name="StatusText" DockPanel.Dock="Right"
-                           HorizontalAlignment="Right" VerticalAlignment="Center"
-                           FontSize="11" Foreground="{DynamicResource ForegroundBrush}"
-                           TextTrimming="CharacterEllipsis"/>
+                </WrapPanel>
             </DockPanel>
         </Border>
 
diff --git a/src/PlanViewer.App/MainWindow.PlanViewer.cs b/src/PlanViewer.App/MainWindow.PlanViewer.cs
index 9e196a5..c8f5d47 100644
--- a/src/PlanViewer.App/MainWindow.PlanViewer.cs
+++ b/src/PlanViewer.App/MainWindow.PlanViewer.cs
@@ -489,6 +489,12 @@ private async Task GetActualPlanFromFile(PlanViewerControl viewer)
             // Replace loading content with the actual plan
             var actualViewer = new PlanViewerControl();
             actualViewer.Metadata = metadata;
+            // Inherit the connection used to run the repro so schema lookups
+            // (Show Indexes, Show Table Definition) remain available on the
+            // new plan tab.
+            actualViewer.ConnectionString = connectionString;
+            actualViewer.SetConnectionServices(_credentialService, _connectionStore);
+            actualViewer.SetConnectionStatus(dialog.ResultConnection.ServerName, database);
             actualViewer.LoadPlan(actualPlanXml, "Actual Plan", queryText);
 
             tab.Content = CreatePlanTabContent(actualViewer);