diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml
index d66a654753..28d9173495 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml
@@ -72,7 +72,14 @@
         
         <ContentControl Grid.Row="3" Grid.Column="1" Margin="3" Content="{Binding SelectedDatasource.ControlPanel, ElementName=This}" />
         
-        <Button x:Name="btnConnect" Grid.Row="4" Grid.Column="1" Margin="3" Content="Connect" HorizontalAlignment="Right" Click="btnConnect_Click" />
+        <Button x:Name="btnConnect"
+                Grid.Row="4"
+                Grid.Column="1"
+                Margin="3"
+                Content="Connect"
+                HorizontalAlignment="Right"
+                IsEnabled="{Binding CanConnect, ElementName=This}"
+                Click="btnConnect_Click" />
         
         <TextBlock Grid.Row="5" Margin="3">Database:</TextBlock>
 
diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml.cs
index 6d5526f6d1..334708f3c2 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml.cs
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml.cs
@@ -58,9 +58,14 @@ namespace ICSharpCode.Data.Core.UI.Windows
 				_selectedDatabaseDriver = value;
 				OnPropertyChanged("SelectedDatabaseDriver");
 				OnPropertyChanged("SelectedDatasource");
+				OnPropertyChanged("CanConnect");
 			}
 		}
 		
+		public bool CanConnect {
+			get { return _selectedDatabaseDriver != null; }
+		}
+		
 		IDatasource GetDefaultDatasource(IDatabaseDriver driver)
 		{
 			if (driver != null) {
@@ -77,6 +82,7 @@ namespace ICSharpCode.Data.Core.UI.Windows
 				else
 					_selectedDatasource = defaultDataSource;
 				OnPropertyChanged("SelectedDatasource");
+				OnPropertyChanged("CanConnect");
 			}
 		}