diff --git a/src/viewer.js b/src/viewer.js
index 9f6e767a..07d55e9e 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -409,14 +409,14 @@ $.Viewer = function( options ) {
     if (!this.drawer.canRotate()) {
         // Disable/remove the rotate left/right buttons since they aren't supported
         if (this.rotateLeft) {
-            i = this.buttons.buttons.indexOf(this.rotateLeft);
-            this.buttons.buttons.splice(i, 1);
-            this.buttons.element.removeChild(this.rotateLeft.element);
+            i = this.buttonGroup.buttons.indexOf(this.rotateLeft);
+            this.buttonGroup.buttons.splice(i, 1);
+            this.buttonGroup.element.removeChild(this.rotateLeft.element);
         }
         if (this.rotateRight) {
-            i = this.buttons.buttons.indexOf(this.rotateRight);
-            this.buttons.buttons.splice(i, 1);
-            this.buttons.element.removeChild(this.rotateRight.element);
+            i = this.buttonGroup.buttons.indexOf(this.rotateRight);
+            this.buttonGroup.buttons.splice(i, 1);
+            this.buttonGroup.element.removeChild(this.rotateRight.element);
         }
     }
 
@@ -774,13 +774,11 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
 
         this.removeAllHandlers();
 
-        if (this.buttons) {
-            if (this.buttons instanceof $.ButtonGroup) {
-                this.buttons.destroy();
-            } else {
-                while (this.buttons.length) {
-                    this.buttons.pop().destroy();
-                }
+        if (this.buttonGroup) {
+            this.buttonGroup.destroy();
+        } else if (this.customButtons) {
+            while (this.customButtons.length) {
+                this.customButtons.pop().destroy();
             }
         }
 
@@ -1855,13 +1853,13 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
             }
 
             if ( useGroup ) {
-                this.buttons = new $.ButtonGroup({
+                this.buttonGroup = new $.ButtonGroup({
                     buttons:            buttons,
                     clickTimeThreshold: this.clickTimeThreshold,
                     clickDistThreshold: this.clickDistThreshold
                 });
 
-                this.navControl  = this.buttons.element;
+                this.navControl  = this.buttonGroup.element;
                 this.addHandler( 'open', $.delegate( this, lightUp ) );
 
                 if( this.toolbar ){
@@ -1876,7 +1874,7 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
                     );
                 }
             } else {
-                this.buttons = buttons;
+                this.customButtons = buttons;
             }
 
         }
@@ -3490,8 +3488,10 @@ function doSingleZoomOut() {
 
 
 function lightUp() {
-    this.buttons.emulateEnter();
-    this.buttons.emulateExit();
+    if (this.buttonGroup) {
+        this.buttonGroup.emulateEnter();
+        this.buttonGroup.emulateExit();
+    }
 }
 
 
@@ -3510,8 +3510,8 @@ function onFullScreen() {
         this.setFullScreen( !this.isFullPage() );
     }
     // correct for no mouseout event on change
-    if ( this.buttons ) {
-        this.buttons.emulateExit();
+    if ( this.buttonGroup ) {
+        this.buttonGroup.emulateExit();
     }
     this.fullPageButton.element.focus();
     if ( this.viewport ) {
diff --git a/test/modules/controls.js b/test/modules/controls.js
index 57d827c9..0e6bdf7c 100644
--- a/test/modules/controls.js
+++ b/test/modules/controls.js
@@ -53,9 +53,9 @@
             assert.ok(viewer.showZoomControl, 'showZoomControl should be on');
             assert.ok(!!viewer.zoomInButton, "zoomIn button should not be null");
             assert.ok(!!viewer.zoomOutButton, "zoomOut button should not be null");
-            assert.notEqual(viewer.buttons.buttons.indexOf(viewer.zoomInButton), -1,
+            assert.notEqual(viewer.buttonGroup.buttons.indexOf(viewer.zoomInButton), -1,
                 "The zoomIn button should be present");
-            assert.notEqual(viewer.buttons.buttons.indexOf(viewer.zoomOutButton), -1,
+            assert.notEqual(viewer.buttonGroup.buttons.indexOf(viewer.zoomOutButton), -1,
                 "The zoomOut button should be present");
 
             var oldZoom = viewer.viewport.getZoom();
@@ -108,7 +108,7 @@
             viewer.removeHandler('open', openHandler);
             assert.ok(viewer.showHomeControl, 'showHomeControl should be on');
             assert.ok(!!viewer.homeButton, "Home button should not be null");
-            assert.notEqual(viewer.buttons.buttons.indexOf(viewer.homeButton), -1,
+            assert.notEqual(viewer.buttonGroup.buttons.indexOf(viewer.homeButton), -1,
                 "The home button should be present");
 
             viewer.viewport.zoomBy(1.1);
@@ -167,7 +167,7 @@
             viewer.removeHandler('open', openHandler);
             assert.ok(viewer.showHomeControl, 'showFullPageControl should be on');
             assert.ok(!!viewer.fullPageButton, "FullPage button should not be null");
-            assert.notEqual(viewer.buttons.buttons.indexOf(viewer.fullPageButton), -1,
+            assert.notEqual(viewer.buttonGroup.buttons.indexOf(viewer.fullPageButton), -1,
                 "The full page button should be present");
 
             assert.ok(!viewer.isFullPage(), "OSD should not be in full page.");
@@ -223,9 +223,9 @@
             assert.ok(viewer.drawer, 'Drawer exists');
             assert.ok(viewer.drawer.canRotate(), 'drawer.canRotate needs to be true');
             assert.ok(viewer.showRotationControl, 'showRotationControl should be true');
-            assert.notEqual(viewer.buttons.buttons.indexOf(viewer.rotateLeftButton), -1,
+            assert.notEqual(viewer.buttonGroup.buttons.indexOf(viewer.rotateLeftButton), -1,
                 "rotateLeft should be found");
-            assert.notEqual(viewer.buttons.buttons.indexOf(viewer.rotateRightButton), -1,
+            assert.notEqual(viewer.buttonGroup.buttons.indexOf(viewer.rotateRightButton), -1,
                 "rotateRight should be found");
 
             // Now simulate the left/right button clicks.