diff --git a/Views/Radios.xaml.cs b/Views/Radios.xaml.cs
index ef23fd5..be89218 100644
--- a/Views/Radios.xaml.cs
+++ b/Views/Radios.xaml.cs
@@ -162,9 +162,7 @@ namespace unison
         private void SearchHandler(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Return)
-            {
                 Search_Clicked(null, null);
-            }
         }
 
         private void Window_Closing(object sender, CancelEventArgs e)
diff --git a/Views/Settings.xaml b/Views/Settings.xaml
index da1182a..183c05e 100644
--- a/Views/Settings.xaml
+++ b/Views/Settings.xaml
@@ -25,12 +25,12 @@
                                 <StackPanel>
                                     <StackPanel>
                                         <TextBlock Text="{x:Static properties:Resources.Settings_Host}" TextWrapping="Wrap" Margin="5,0,0,0"/>
-                                        <TextBox x:Name="MpdHost" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
+                                        <TextBox x:Name="MpdHost" KeyDown="ConnectHandler" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
                                     </StackPanel>
 
                                     <StackPanel Margin="0,5,0,0">
                                         <TextBlock Text="{x:Static properties:Resources.Settings_Port}" TextWrapping="Wrap" Margin="5,0,0,0"/>
-                                        <TextBox x:Name="MpdPort" MaxLength="5" PreviewTextInput="NumberValidationTextBox" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
+                                        <TextBox x:Name="MpdPort" KeyDown="ConnectHandler" MaxLength="5" PreviewTextInput="NumberValidationTextBox" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
                                     </StackPanel>
 
                                     <!--<StackPanel Margin="0,5,0,0">
diff --git a/Views/Settings.xaml.cs b/Views/Settings.xaml.cs
index bd0aace..2ee47bd 100644
--- a/Views/Settings.xaml.cs
+++ b/Views/Settings.xaml.cs
@@ -101,6 +101,12 @@ namespace unison
             Properties.Settings.Default.Save();
         }
 
+        private void ConnectHandler(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Return)
+                MPDConnect_Clicked(null, null);
+        }
+
         private void Window_Closing(object sender, CancelEventArgs e)
         {
             e.Cancel = true;