diff --git a/src/UI/Cells/EpisodeActionsCellTemplate.html b/src/UI/Cells/EpisodeActionsCellTemplate.html
index 77e0ef5cd..a30cf3d5f 100644
--- a/src/UI/Cells/EpisodeActionsCellTemplate.html
+++ b/src/UI/Cells/EpisodeActionsCellTemplate.html
@@ -1,5 +1,5 @@
 <div class="btn-group hidden-xs">
-    <button class="btn btn-xs x-automatic-search x-automatic-search-icon" title="Automatic Search"><i class="icon-search"></i></button>
+    <button class="btn btn-xs x-automatic-search x-automatic-search-icon" title="Automatic Search" data-container="body"><i class="icon-search"></i></button>
     <button class="btn btn-xs dropdown-toggle" data-toggle="dropdown">
         <span class="caret"></span>
     </button>
diff --git a/src/UI/Shared/Toolbar/Radio/RadioButtonView.js b/src/UI/Shared/Toolbar/Radio/RadioButtonView.js
index fe67f68cf..a72863d5a 100644
--- a/src/UI/Shared/Toolbar/Radio/RadioButtonView.js
+++ b/src/UI/Shared/Toolbar/Radio/RadioButtonView.js
@@ -34,6 +34,7 @@ define(
 
                 if (this.model.get('tooltip')) {
                     this.$el.attr('title', this.model.get('tooltip'));
+                    this.$el.attr('data-container', 'body');
                 }
             },