diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE
index 90642b346b4..caa3ba49298 100644
--- a/zeppelin-distribution/src/bin_license/LICENSE
+++ b/zeppelin-distribution/src/bin_license/LICENSE
@@ -234,7 +234,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version
     (The MIT License) bootstrap3-dialog v1.34.7 (https://github.com/nakupanda/bootstrap3-dialog/tree/v1.34.7) - https://github.com/nakupanda/bootstrap3-dialog/tree/v1.34.7
     (The MIT License) Angular Websocket v1.0.13 (http://angularclass.github.io/angular-websocket/) - https://github.com/AngularClass/angular-websocket/blob/v1.0.13/LICENSE
     (The MIT License) UI.Ace v0.1.1 (http://angularclass.github.io/angular-websocket/) - https://github.com/angular-ui/ui-ace/blob/master/LICENSE
-    (The MIT License) jquery.scrollTo v1.4.13 (https://github.com/flesler/jquery.scrollTo) - https://github.com/flesler/jquery.scrollTo/blob/1.4.13/LICENSE
+    (The MIT License) jquery.scrollTo v2.1.2 (https://github.com/flesler/jquery.scrollTo) - https://github.com/flesler/jquery.scrollTo/blob/2.1.2/LICENSE
     (The MIT License) angular-dragdrop v1.0.8 (http://codef0rmer.github.io/angular-dragdrop/#/) - https://github.com/codef0rmer/angular-dragdrop/blob/v1.0.8/LICENSE
     (The MIT License) perfect-scrollbar v0.5.4 (http://noraesae.github.io/perfect-scrollbar/) - https://github.com/noraesae/perfect-scrollbar/tree/0.5.4
     (The MIT License) ng-sortable v1.3.6 (https://github.com/a5hik/ng-sortable) - https://github.com/a5hik/ng-sortable/blob/1.3.6/LICENSE
diff --git a/zeppelin-distribution/src/bin_license/licenses/LICENSE-jquery.scrollTo-1.4.13 b/zeppelin-distribution/src/bin_license/licenses/LICENSE-jquery.scrollTo-2.1.2
similarity index 89%
rename from zeppelin-distribution/src/bin_license/licenses/LICENSE-jquery.scrollTo-1.4.13
rename to zeppelin-distribution/src/bin_license/licenses/LICENSE-jquery.scrollTo-2.1.2
index aeaf77d8a6e..fe5853e27cf 100644
--- a/zeppelin-distribution/src/bin_license/licenses/LICENSE-jquery.scrollTo-1.4.13
+++ b/zeppelin-distribution/src/bin_license/licenses/LICENSE-jquery.scrollTo-2.1.2
@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2007-2014 Ariel Flesler <aflesler@gmail.com>
+Copyright (c) 2007-2015 Ariel Flesler <aflesler@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json
index 33194adeccb..1e9c480dda5 100644
--- a/zeppelin-web/bower.json
+++ b/zeppelin-web/bower.json
@@ -16,7 +16,7 @@
     "angular-websocket": "~1.0.13",
     "ace-builds": "1.3.2",
     "angular-ui-ace": "0.1.3",
-    "jquery.scrollTo": "~1.4.13",
+    "jquery.scrollTo": "~2.1.2",
     "nvd3": "~1.8.5",
     "angular-dragdrop": "~1.0.8",
     "perfect-scrollbar": "~0.5.4",
@@ -71,6 +71,7 @@
   },
   "resolutions": {
     "ace-builds": "1.3.2",
-    "angular": ">=1.5.0 <1.6"
+    "angular": ">=1.5.0 <1.6",
+    "jquery.scrollTo": "~2.1.2"
   }
 }
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index cbe88778b38..9a766de26c0 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -1199,7 +1199,9 @@ function ParagraphCtrl($scope, $rootScope, $route, $window, $routeParams, $locat
     bodyEl.finish();
 
     // scroll to scrollTargetPos
-    bodyEl.scrollTo(scrollTargetPos, {axis: 'y', interrupt: true, duration: 100});
+    if (scrollTargetPos) {
+      bodyEl.scrollTo(scrollTargetPos, {axis: 'y', interrupt: true, duration: 100});
+    }
   };
 
   $scope.getEditorValue = function() {