diff --git a/resources/js/Viewport/HelioviewerViewport.js b/resources/js/Viewport/HelioviewerViewport.js
index 8629681c1..a81aea530 100644
--- a/resources/js/Viewport/HelioviewerViewport.js
+++ b/resources/js/Viewport/HelioviewerViewport.js
@@ -231,7 +231,7 @@ var HelioviewerViewport = Class.extend(
         $(this.domNode).bind("mousedown", $.proxy(this.onMouseMove, this));
         this.domNode.dblclick($.proxy(this.doubleClick, this));
 
-        $('#center-button').click($.proxy(this.centerViewportOnBiggestLayer, this));
+        $('#center-button').click(() => {$(document).trigger('center-viewport');});
         $(window).resize($.proxy(this.resize, this));
     },
 
diff --git a/resources/js/Viewport/Helper/HelioviewerZoomer.js b/resources/js/Viewport/Helper/HelioviewerZoomer.js
index 89fb833a2..fe308b186 100644
--- a/resources/js/Viewport/Helper/HelioviewerZoomer.js
+++ b/resources/js/Viewport/Helper/HelioviewerZoomer.js
@@ -14,11 +14,7 @@
         this._initZoomLevel();
         this._initializePinchListeners();
         this._zoomInBtn = document.getElementById('zoom-in-button');
-        this._zoomInBtn.addEventListener('click', this._smoothZoomIn.bind(this));
-        $(document).bind("zoom-in", this._smoothZoomIn.bind(this));
         this._zoomOutBtn = document.getElementById('zoom-out-button');
-        this._zoomOutBtn.addEventListener('click', this._smoothZoomOut.bind(this));
-        $(document).bind("zoom-out", this._smoothZoomOut.bind(this));
         this._mc = document.getElementById('moving-container');
         this._sandbox = document.getElementById('sandbox');
         this._scale = 1;
@@ -26,6 +22,25 @@
         this._last_size = 0;
         this._css_rules = [];
         Helioviewer.userSettings.set('mobileZoomScale', 1);
+
+        // Make sure the sun is centered when the user requests centering the viewport
+        $(document).bind("center-viewport", this._resetOrigin.bind(this));
+
+        // Register zoom in button click and zoom-in event
+        this._zoomInBtn.addEventListener('click', this._smoothZoomIn.bind(this));
+        $(document).bind("zoom-in", this._smoothZoomIn.bind(this));
+
+        // Register zoom out button click and zoom-out event.
+        this._zoomOutBtn.addEventListener('click', this._smoothZoomOut.bind(this));
+        $(document).bind("zoom-out", this._smoothZoomOut.bind(this));
+    }
+
+    /**
+     * Resets the transform origin property from the moving container
+     * so that the transform origin is at sun center.
+     */
+    _resetOrigin() {
+        this.setAnchor({left: 0, top: 0});
     }
 
     /**