diff --git a/src/OpenIPC.Viewer.App/Views/Dialogs/CameraEditorContent.axaml b/src/OpenIPC.Viewer.App/Views/Dialogs/CameraEditorContent.axaml
index 18aec8a..490f597 100644
--- a/src/OpenIPC.Viewer.App/Views/Dialogs/CameraEditorContent.axaml
+++ b/src/OpenIPC.Viewer.App/Views/Dialogs/CameraEditorContent.axaml
@@ -100,21 +100,25 @@
     </ScrollViewer>
 
     <Grid Grid.Row="2" ColumnDefinitions="Auto,*,Auto,Auto" Margin="0,24,0,0">
-      <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="10" VerticalAlignment="Center">
-        <Button Content="{Binding [CameraEditor.Button.TestConnection], Source={x:Static svc:Localizer.Instance}}"
-                Command="{Binding TestConnectionCommand}"
-                Padding="12,8"
-                Background="Transparent"
-                BorderBrush="{StaticResource BorderMediumBrush}"
-                BorderThickness="1"
-                CornerRadius="6"
-                Foreground="{StaticResource TextPrimaryBrush}" />
-        <TextBlock Text="{Binding TestStatus}"
-                   FontSize="{StaticResource FontSizeSm}"
-                   Foreground="{StaticResource TextSecondaryBrush}"
-                   VerticalAlignment="Center"
-                   IsVisible="{Binding TestStatus, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
-      </StackPanel>
+      <Button Grid.Column="0"
+              Content="{Binding [CameraEditor.Button.TestConnection], Source={x:Static svc:Localizer.Instance}}"
+              Command="{Binding TestConnectionCommand}"
+              Padding="12,8"
+              VerticalAlignment="Center"
+              Background="Transparent"
+              BorderBrush="{StaticResource BorderMediumBrush}"
+              BorderThickness="1"
+              CornerRadius="6"
+              Foreground="{StaticResource TextPrimaryBrush}" />
+      <TextBlock Grid.Column="1"
+                 Text="{Binding TestStatus}"
+                 FontSize="{StaticResource FontSizeSm}"
+                 Foreground="{StaticResource TextSecondaryBrush}"
+                 VerticalAlignment="Center"
+                 Margin="10,0"
+                 TextTrimming="CharacterEllipsis"
+                 ToolTip.Tip="{Binding TestStatus}"
+                 IsVisible="{Binding TestStatus, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
       <Button Grid.Column="2"
               Name="CancelButton"
               Content="{Binding [Common.Cancel], Source={x:Static svc:Localizer.Instance}}"