diff --git a/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderView.js b/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderView.js
index 92f1d7464..e2f50f53f 100644
--- a/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderView.js
+++ b/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderView.js
@@ -1,6 +1,6 @@
 'use strict;'
 
-define(['app', 'AddSeries/RootFolders/RootFolderCollection', 'Shared/AutoComplete'], function (app,rootFolders) {
+define(['app', 'AddSeries/RootFolders/RootFolderCollection', 'Mixins/AutoComplete'], function (app,rootFolders) {
 
 
     NzbDrone.AddSeries.RootFolderItemView = Backbone.Marionette.ItemView.extend({
diff --git a/NzbDrone.Backbone/Shared/AutoComplete.js b/NzbDrone.Backbone/Mixins/AutoComplete.js
similarity index 100%
rename from NzbDrone.Backbone/Shared/AutoComplete.js
rename to NzbDrone.Backbone/Mixins/AutoComplete.js
diff --git a/NzbDrone.Backbone/Settings/DownloadClient/DownloadClientTemplate.html b/NzbDrone.Backbone/Settings/DownloadClient/DownloadClientTemplate.html
index 70c60e335..205823830 100644
--- a/NzbDrone.Backbone/Settings/DownloadClient/DownloadClientTemplate.html
+++ b/NzbDrone.Backbone/Settings/DownloadClient/DownloadClientTemplate.html
@@ -15,11 +15,10 @@
             </span>
         </div>
     </div>
-    <!--Todo: This should auto-complete-->
     <div class="control-group">
         <label class="control-label">Unsorted TV Directory</label>
         <div class="controls">
-            <input type="text" placeholder="C:\Unsorted TV" name="downloadClientDropDirectory" />
+            <input type="text" placeholder="C:\Unsorted TV" name="downloadClientDropDirectory" class="x-path" />
             <span class="help-inline">
                 <i class="icon-question-sign" title="The directory where your download client downloads TV shows to."></i>
             </span>
@@ -159,11 +158,10 @@
 
 <fieldset>
     <legend>Blackhole</legend>
-    <!--Todo: This should auto-complete-->
     <div class="control-group">
         <label class="control-label">Blackhole Directory</label>
         <div class="controls">
-            <input type="text" name="blackholeDirectory" />
+            <input type="text" name="blackholeDirectory" class="x-path" />
             <span class="help-inline">
                 <i class="icon-question-sign" title="The directory where your download client will pickup .nzb files"></i>
             </span>
@@ -173,11 +171,10 @@
 
 <fieldset>
     <legend>Pneumatic</legend>
-    <!--Todo: This should auto-complete-->
     <div class="control-group">
         <label class="control-label">Nzb Directory</label>
         <div class="controls">
-            <input type="text" name="pneumaticDirectory" />
+            <input type="text" name="pneumaticDirectory" class="x-path" />
             <span class="help-inline">
                 <i class="icon-question-sign" title="Directory to save NZBs for Pneumatic<br/>must be accessible from XBMC"></i>
             </span>
diff --git a/NzbDrone.Backbone/Settings/DownloadClient/DownloadClientView.js b/NzbDrone.Backbone/Settings/DownloadClient/DownloadClientView.js
index 2ea5a20e0..5295b6bc8 100644
--- a/NzbDrone.Backbone/Settings/DownloadClient/DownloadClientView.js
+++ b/NzbDrone.Backbone/Settings/DownloadClient/DownloadClientView.js
@@ -11,13 +11,15 @@ define([
 
         ui: {
             switch: '.switch',
-            tooltip: '[class^="help-inline"] i'
+            tooltip: '[class^="help-inline"] i',
+            pathInput: '.x-path'
         },
 
         onRender: function () {
             NzbDrone.ModelBinder.bind(this.model, this.el);
             this.ui.switch.bootstrapSwitch();
             this.ui.tooltip.tooltip({ placement: 'right', html: true });
+            this.ui.pathInput.autoComplete('/directories');
         }
     });
 });