diff --git a/src/UI/Cells/EpisodeActionsCellTemplate.html b/src/UI/Cells/EpisodeActionsCellTemplate.html
index a0d4c81d4..77e0ef5cd 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" data-container="body"><i class="icon-search"></i></button>
+    <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 dropdown-toggle" data-toggle="dropdown">
         <span class="caret"></span>
     </button>
@@ -10,5 +10,5 @@
 </div>
 
 <div class="visible-xs">
-    <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 x-automatic-search x-automatic-search-icon" title="Automatic Search"><i class="icon-search"></i></button>
 </div>
\ No newline at end of file
diff --git a/src/UI/Cells/EpisodeStatusCell.js b/src/UI/Cells/EpisodeStatusCell.js
index 1b4d6a68c..c2b23a41f 100644
--- a/src/UI/Cells/EpisodeStatusCell.js
+++ b/src/UI/Cells/EpisodeStatusCell.js
@@ -69,7 +69,7 @@ define(
                         if (downloading) {
                             var progress = 100 - (downloading.get('sizeleft') / downloading.get('size') * 100);
 
-                            this.$el.html('<div class="progress progress-purple" title="Episode is downloading - {0}% {1}" data-container="body">'.format(progress.toFixed(1), downloading.get('title')) +
+                            this.$el.html('<div class="progress progress-purple" title="Episode is downloading - {0}% {1}">'.format(progress.toFixed(1), downloading.get('title')) +
                                           '<div class="bar" style="width: {0}%;"></div></div>'.format(progress));
                             return;
                         }
diff --git a/src/UI/Settings/General/GeneralViewTemplate.html b/src/UI/Settings/General/GeneralViewTemplate.html
index cfbca24bd..60e42c462 100644
--- a/src/UI/Settings/General/GeneralViewTemplate.html
+++ b/src/UI/Settings/General/GeneralViewTemplate.html
@@ -147,7 +147,7 @@
                     <input type="text" name="apiKey" readonly="readonly" class="form-control x-api-key"/>
                     <div class="input-group-btn">
                         <button class="btn btn-icon-only x-copy-api-key hidden-xs"><i class="icon-copy"></i></button>
-                        <button class="btn btn-danger btn-icon-only x-reset-api-key" title="Reset API Key" data-container="body"><i class="icon-refresh"></i></button>
+                        <button class="btn btn-danger btn-icon-only x-reset-api-key" title="Reset API Key"><i class="icon-refresh"></i></button>
                     </div>
                 </div>
             </div>
diff --git a/src/UI/Shared/Toolbar/Radio/RadioButtonView.js b/src/UI/Shared/Toolbar/Radio/RadioButtonView.js
index a72863d5a..fe67f68cf 100644
--- a/src/UI/Shared/Toolbar/Radio/RadioButtonView.js
+++ b/src/UI/Shared/Toolbar/Radio/RadioButtonView.js
@@ -34,7 +34,6 @@ define(
 
                 if (this.model.get('tooltip')) {
                     this.$el.attr('title', this.model.get('tooltip'));
-                    this.$el.attr('data-container', 'body');
                 }
             },
 
diff --git a/src/UI/System/Logs/Table/LogTimeCell.js b/src/UI/System/Logs/Table/LogTimeCell.js
index a61ae8878..20ee23641 100644
--- a/src/UI/System/Logs/Table/LogTimeCell.js
+++ b/src/UI/System/Logs/Table/LogTimeCell.js
@@ -13,7 +13,6 @@ define(
                 var date = Moment(this._getValue());
                 this.$el.html(date.format('LT'));
                 this.$el.attr('title', date.format('LLLL'));
-                this.$el.attr('data-container', 'body');
 
                 return this;
             }
diff --git a/src/UI/System/SystemLayoutTemplate.html b/src/UI/System/SystemLayoutTemplate.html
index e3b245715..c84df1ca7 100644
--- a/src/UI/System/SystemLayoutTemplate.html
+++ b/src/UI/System/SystemLayoutTemplate.html
@@ -4,10 +4,10 @@
     <li><a href="#updates" class="x-updates-tab no-router">Updates</a></li>
     <li class="lifecycle-controls pull-right">
         <div class="btn-group">
-            <button class="btn btn-default btn-icon-only x-shutdown" title="Shutdown" data-container="body">
+            <button class="btn btn-default btn-icon-only x-shutdown" title="Shutdown">
                 <i class="icon-nd-shutdown"></i>
             </button>
-            <button class="btn btn-default btn-icon-only x-restart" title="Restart" data-container="body">
+            <button class="btn btn-default btn-icon-only x-restart" title="Restart">
                 <i class="icon-nd-restart"></i>
             </button>
         </div>
diff --git a/src/UI/app.js b/src/UI/app.js
index 27a02eafc..a54198702 100644
--- a/src/UI/app.js
+++ b/src/UI/app.js
@@ -71,7 +71,8 @@ require.config({
                 ],
             init: function ($) {
                 $('body').tooltip({
-                    selector: '[title]'
+                    selector: '[title]',
+                    container: 'body'
                 });
             }
         },