diff --git a/changelog.txt b/changelog.txt
index 32d50557..e2de9bf0 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -20,6 +20,8 @@ Viewport.contentAspectY have been removed.
 * Added Viewer.addSimpleImage method for easily adding non-tiled images (#827)
 * DziTileSource now works properly with DZI files that have no extension (#835)
 * Fixed content clipping with rotation (#463, #567 and #833)
+* Fixed navigator not being rotated when viewport rotation is set in constructor (#840)
+* Fixed: Viewer.setMouseNavEnabled wasn't affecting all of the viewer's trackers (#845)
 
 2.1.0:
 
diff --git a/src/viewer.js b/src/viewer.js
index 7827003b..136040d4 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -779,6 +779,7 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
      */
     setMouseNavEnabled: function( enabled ){
         this.innerTracker.setTracking( enabled );
+        this.outerTracker.setTracking( enabled );
         /**
          * Raised when mouse/touch navigation is enabled or disabled (see {@link OpenSeadragon.Viewer#setMouseNavEnabled}).
          *