diff --git a/doc/classes.list.html b/doc/classes.list.html
index b4bd786c..52a4c67d 100644
--- a/doc/classes.list.html
+++ b/doc/classes.list.html
@@ -168,7 +168,7 @@ <h3 class="subsection-title">Classes</h3>
 					
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-12-13T14:44:21-06:00 using the <a
+		on 2014-12-13T14:51:55-06:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
diff --git a/doc/global.html b/doc/global.html
index a2cbfa56..fde65652 100644
--- a/doc/global.html
+++ b/doc/global.html
@@ -510,7 +510,7 @@ <h4><span class="type-signature"></span>osmplayer<span class="type-signature"></
 					
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-12-13T14:44:21-06:00 using the <a
+		on 2014-12-13T14:51:55-06:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
diff --git a/doc/global.html#osmplayer b/doc/global.html#osmplayer
index 72773cd2..f3c0d201 100644
--- a/doc/global.html#osmplayer
+++ b/doc/global.html#osmplayer
@@ -1857,7 +1857,7 @@
 					
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-12-13T14:44:21-06:00 using the <a
+		on 2014-12-13T14:51:55-06:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
diff --git a/doc/index.html b/doc/index.html
index 49d01f62..fc616850 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -101,7 +101,7 @@
 					
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-12-13T14:44:21-06:00 using the <a
+		on 2014-12-13T14:51:55-06:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
diff --git a/doc/osmplayer.pager.html b/doc/osmplayer.pager.html
index 2a48a4d2..e4713bc4 100644
--- a/doc/osmplayer.pager.html
+++ b/doc/osmplayer.pager.html
@@ -385,7 +385,7 @@ <h4 class="name" id="construct"><span class="type-signature"></span>construct<sp
 					
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-12-13T14:44:21-06:00 using the <a
+		on 2014-12-13T14:51:55-06:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
diff --git a/doc/osmplayer.playlist.html b/doc/osmplayer.playlist.html
index d0c9530e..0f1f034a 100644
--- a/doc/osmplayer.playlist.html
+++ b/doc/osmplayer.playlist.html
@@ -1896,7 +1896,7 @@ <h4 class="name" id="setQueue"><span class="type-signature"></span>setQueue<span
 					
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-12-13T14:44:21-06:00 using the <a
+		on 2014-12-13T14:51:55-06:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
diff --git a/doc/osmplayer.teaser.html b/doc/osmplayer.teaser.html
index 49f7e616..ec3a674a 100644
--- a/doc/osmplayer.teaser.html
+++ b/doc/osmplayer.teaser.html
@@ -597,7 +597,7 @@ <h5>Parameters:</h5>
 					
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-12-13T14:44:21-06:00 using the <a
+		on 2014-12-13T14:51:55-06:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
diff --git a/doc/prototype..html b/doc/prototype..html
index 3fda7bfd..b0396f5a 100644
--- a/doc/prototype..html
+++ b/doc/prototype..html
@@ -247,7 +247,7 @@ <h5>Returns:</h5>
 					
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-12-13T14:44:21-06:00 using the <a
+		on 2014-12-13T14:51:55-06:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
diff --git a/templates/simpleblack/js/osmplayer.controller.simpleblack.js b/templates/simpleblack/js/osmplayer.controller.simpleblack.js
index b5a5eca1..82065eff 100644
--- a/templates/simpleblack/js/osmplayer.controller.simpleblack.js
+++ b/templates/simpleblack/js/osmplayer.controller.simpleblack.js
@@ -32,6 +32,15 @@
 
     minplayer.controller.prototype.construct.call(this);
     var self = this;
+
+    // Don't execute if we want to hide the controller.
+    if (!this.options.showController) {
+      this.get('player', function(player) {
+        player.display.removeClass('with-controller');
+      });
+      return;
+    }
+
     this.get('player', function(player) {
       if (self.options.controllerOnly) {
         player.display.addClass('controller-only');
diff --git a/templates/stretchy/js/osmplayer.controller.stretchy.js b/templates/stretchy/js/osmplayer.controller.stretchy.js
index f924e0f0..216c537f 100644
--- a/templates/stretchy/js/osmplayer.controller.stretchy.js
+++ b/templates/stretchy/js/osmplayer.controller.stretchy.js
@@ -36,7 +36,9 @@
 
     // Don't execute if we want to hide the controller.
     if (!this.options.showController) {
-      this.display.removeClass('with-controller');
+      this.get('player', function(player) {
+        player.display.removeClass('with-controller');
+      });
       return;
     }