diff --git a/src/js/plugin/update-geometry.js b/src/js/plugin/update-geometry.js
index b1dd110..86e6fcc 100644
--- a/src/js/plugin/update-geometry.js
+++ b/src/js/plugin/update-geometry.js
@@ -55,10 +55,6 @@ function updateCss(element, i) {
 module.exports = function (element) {
   var i = instances.get(element);
 
-  // Hide scrollbars not to affect scrollWidth and scrollHeight
-  cls.remove(element, 'ps-active-x');
-  cls.remove(element, 'ps-active-y');
-
   i.containerWidth = element.clientWidth;
   i.containerHeight = element.clientHeight;
   i.contentWidth = element.scrollWidth;
@@ -97,10 +93,6 @@ module.exports = function (element) {
 
   updateCss(element, i);
 
-  if (i.scrollbarXActive) {
-    cls.add(element, 'ps-active-x');
-  }
-  if (i.scrollbarYActive) {
-    cls.add(element, 'ps-active-y');
-  }
+  cls[i.scrollbarXActive ? 'add' : 'remove'](element, 'ps-active-x');
+  cls[i.scrollbarYActive ? 'add' : 'remove'](element, 'ps-active-y');
 };
diff --git a/src/js/plugin/update.js b/src/js/plugin/update.js
index 2b86bd3..0e09994 100644
--- a/src/js/plugin/update.js
+++ b/src/js/plugin/update.js
@@ -3,7 +3,8 @@
  */
 'use strict';
 
-var destroy = require('./destroy')
+var d = require('../lib/dom')
+  , destroy = require('./destroy')
   , initialize = require('./initialize')
   , instances = require('./instances')
   , updateGeometry = require('./update-geometry');
@@ -17,6 +18,13 @@ module.exports = function (element) {
     destroy(element);
     initialize(element);
   } else {
+    // Hide scrollbars not to affect scrollWidth and scrollHeight
+    d.css(i.scrollbarXRail, 'display', 'none');
+    d.css(i.scrollbarYRail, 'display', 'none');
+
     updateGeometry(element);
+
+    d.css(i.scrollbarXRail, 'display', 'block');
+    d.css(i.scrollbarYRail, 'display', 'block');
   }
 };