diff --git a/FindInFiles/FindInFiles.csproj b/FindInFiles/FindInFiles.csproj
index bcc7285..859d7f7 100644
--- a/FindInFiles/FindInFiles.csproj
+++ b/FindInFiles/FindInFiles.csproj
@@ -38,6 +38,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
diff --git a/FindInFiles/MainWindow.xaml b/FindInFiles/MainWindow.xaml
index 2e8dffd..21fc726 100644
--- a/FindInFiles/MainWindow.xaml
+++ b/FindInFiles/MainWindow.xaml
@@ -14,7 +14,7 @@
 			<ColumnDefinition/>
 		</Grid.ColumnDefinitions>
 		<Button x:Name="btnFind" Content="Find" HorizontalAlignment="Left" Margin="242,28,0,0" VerticalAlignment="Top" Width="75" Click="btnFind_Click" Height="22"/>
-		<Button x:Name="btnBrowse" Content="..." HorizontalAlignment="Left" Margin="686,28,0,0" VerticalAlignment="Top" Width="75" Click="btnBrowse_Click" Height="22" IsEnabled="False"/>
+		<Button x:Name="btnBrowse" Content="..." HorizontalAlignment="Left" Margin="686,28,0,0" VerticalAlignment="Top" Width="75" Click="btnBrowse_Click" Height="22"/>
 		<DataGrid x:Name="gridResults" HorizontalAlignment="Left" Height="294" Margin="11,58,0,0" VerticalAlignment="Top" Width="754" MouseDoubleClick="gridResults_MouseDoubleClick" IsReadOnly="True" IsTabStop="True" TabIndex="2"/>
 		<ComboBox x:Name="cmbSearch" HorizontalAlignment="Left" Margin="10,28,0,0" VerticalAlignment="Top" Width="227" KeyDown="OnKeyDownSearch" IsEditable="True" DropDownClosed="cmbSearch_DropDownClosed" IsSynchronizedWithCurrentItem="True" IsTabStop="True" TabIndex="0" Loaded="cmbSearch_Loaded" />
 		<ComboBox x:Name="cmbFolder" HorizontalAlignment="Left" Margin="356,28,0,0" VerticalAlignment="Top" KeyDown="OnKeyDownFolder" Width="325" IsEditable="True" IsTabStop="True" TabIndex="1"/>
diff --git a/FindInFiles/MainWindow.xaml.cs b/FindInFiles/MainWindow.xaml.cs
index 9ec81ff..9fd17a9 100644
--- a/FindInFiles/MainWindow.xaml.cs
+++ b/FindInFiles/MainWindow.xaml.cs
@@ -1,4 +1,4 @@
-// simple Find In Files tool for searching files containting given string
+// simple Find In Files tool for searching files containting given string
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -10,6 +10,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using WinForms = System.Windows.Forms;
 
 namespace FindInFiles
 {
@@ -140,7 +141,15 @@ void AddFolderHistory(string folderString)
 
         private void btnBrowse_Click(object sender, RoutedEventArgs e)
         {
-            // TODO browse for folder
+            // Create Folder Browser and give it a title
+            WinForms.FolderBrowserDialog folderBrowser = new WinForms.FolderBrowserDialog();
+            folderBrowser.Description = "Select a foooooolder";
+
+            // show it to the user
+            folderBrowser.ShowDialog();
+
+            // retrieve the input
+            cmbFolder.Text = folderBrowser.SelectedPath;
         }
 
         // special keys for search field