diff --git a/UI/AddSeries/AddSeriesLayout.js b/UI/AddSeries/AddSeriesLayout.js
index 0cb7abd14..e5a97edc7 100644
--- a/UI/AddSeries/AddSeriesLayout.js
+++ b/UI/AddSeries/AddSeriesLayout.js
@@ -39,9 +39,6 @@ define(
                 SeriesCollection.fetch();
                 QualityProfileCollection.fetch();
                 RootFolderCollection.fetch();
-
-                this.rootFolderLayout = new RootFolderLayout();
-                this.rootFolderLayout.on('folderSelected', this._folderSelected, this);
             },
 
             onShow: function () {
@@ -55,6 +52,8 @@ define(
             },
 
             _importSeries: function () {
+                this.rootFolderLayout = new RootFolderLayout();
+                this.rootFolderLayout.on('folderSelected', this._folderSelected, this);
                 App.modalRegion.show(this.rootFolderLayout);
             },
 
diff --git a/UI/AddSeries/RootFolders/LayoutTemplate.html b/UI/AddSeries/RootFolders/LayoutTemplate.html
index e91145cef..2a5d5f350 100644
--- a/UI/AddSeries/RootFolders/LayoutTemplate.html
+++ b/UI/AddSeries/RootFolders/LayoutTemplate.html
@@ -11,7 +11,7 @@
     {{#if items}}
     <h4>Recent Folders</h4>
     {{/if}}
-    <div id="current-dirs"/>
+    <div id="current-dirs" class="root-folders-list"></div>
 </div>
 <div class="modal-footer">
     <button class="btn" data-dismiss="modal">close</button>
diff --git a/UI/AddSeries/addSeries.less b/UI/AddSeries/addSeries.less
index 500b435f4..b11cf2a17 100644
--- a/UI/AddSeries/addSeries.less
+++ b/UI/AddSeries/addSeries.less
@@ -118,5 +118,10 @@ li.add-new:hover {
 }
 
 .root-folders-modal {
-  overflow: visible;
+  overflow: hidden;
+
+  .root-folders-list {
+    overflow: auto;
+    max-height: 300px;
+  }
 }
\ No newline at end of file