diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 1a921769f49..abbdc5d88a0 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -629,9 +629,18 @@ function ParagraphCtrl ($scope, $rootScope, $route, $window, $routeParams, $loca
       $scope.editor.getSession().setUseWrapMode(true)
       $scope.editor.setTheme('ace/theme/chrome')
       $scope.editor.setReadOnly($scope.isRunning($scope.paragraph))
+
       if ($scope.paragraphFocused) {
+        let prefix = '%' + getInterpreterName($scope.paragraph.text)
+        let paragraphText = $scope.paragraph.text ? $scope.paragraph.text.trim() : ''
+
         $scope.editor.focus()
         $scope.goToEnd($scope.editor)
+        if (prefix === paragraphText) {
+          $timeout(function () {
+            $scope.editor.gotoLine(2, 0)
+          }, 0)
+        }
       }
 
       autoAdjustEditorHeight(_editor)