diff --git a/web/pgadmin/feature_tests/view_data_dml_queries.py b/web/pgadmin/feature_tests/view_data_dml_queries.py
index 6e38036ce..93e20c130 100644
--- a/web/pgadmin/feature_tests/view_data_dml_queries.py
+++ b/web/pgadmin/feature_tests/view_data_dml_queries.py
@@ -253,22 +253,20 @@ CREATE TABLE public.nonintpkey
         elif cell_type in ['json', 'jsonb']:
             jsoneditor_area_ele = self.page.find_by_css_selector(
                 QueryToolLocators.json_editor_text_area_css)
-            if not value == "":
-                actions = ActionChains(self.driver)
-                platform = 'mac'
-                if "platform" in self.driver.capabilities:
-                    platform = (self.driver.capabilities["platform"]).lower()
-                elif "platformName" in self.driver.capabilities:
-                    platform = \
-                        (self.driver.capabilities["platformName"]).lower()
-                if 'mac' in platform:
-                    key_to_press = Keys.COMMAND
-                else:
-                    key_to_press = Keys.CONTROL
-                ActionChains(self.driver).key_down(key_to_press)\
-                    .send_keys('a').key_up(key_to_press)\
-                    .send_keys(Keys.DELETE).perform()
-                ActionChains(self.driver).send_keys(value) .perform()
+            platform = 'mac'
+            if "platform" in self.driver.capabilities:
+                platform = (self.driver.capabilities["platform"]).lower()
+            elif "platformName" in self.driver.capabilities:
+                platform = (self.driver.capabilities["platformName"]).lower()
+            if 'mac' in platform:
+                key_to_press = Keys.COMMAND
+            else:
+                key_to_press = Keys.CONTROL
+            actions = ActionChains(self.driver)
+            actions.move_to_element(jsoneditor_area_ele).click().perform()
+            actions.key_down(key_to_press).send_keys('a').key_up(key_to_press)\
+                .send_keys(Keys.DELETE).perform()
+            actions.send_keys(value) .perform()
             # Click on editor's Save button
             self.page.find_by_css_selector(
                 QueryToolLocators.text_editor_ok_btn_css).click()
diff --git a/web/pgadmin/static/js/slickgrid/editors.js b/web/pgadmin/static/js/slickgrid/editors.js
index 8a2bffd5f..4e386eb28 100644
--- a/web/pgadmin/static/js/slickgrid/editors.js
+++ b/web/pgadmin/static/js/slickgrid/editors.js
@@ -15,6 +15,7 @@
 
 import JSONBigNumberLib from 'json-bignumber';
 import gettext from 'sources/gettext';
+import Alertify from 'pgadmin.alertifyjs';
 
 (function($, JSONBigNumber) {
   // register namespace
@@ -344,6 +345,7 @@ import gettext from 'sources/gettext';
 
     this.position = function(position) {
       calculateEditorPosition(position, $wrapper);
+      position.top = Math.max(position.top, 0);
       $wrapper
         .css('top', position.top)
         .css('left', position.left);
@@ -363,42 +365,41 @@ import gettext from 'sources/gettext';
       /* Can be useful until JSON editor loads */
       tmpdata = data;
 
-      if (_.isNull(data)){
-        defaultValue = undefined;
-        data = undefined;
-      }
-
       /* If jsonb or array */
       if(args.column.column_type_internal === 'jsonb' && !Array.isArray(data) && data != null) {
-        data = JSONBigNumber.stringify(JSONBigNumber.parse(data), null, 4);
+        data = JSONBigNumber.stringify(JSONBigNumber.parse(data), null, 2);
       } else if (Array.isArray(data)) {
         var temp = [];
         $.each(data, function(i, val) {
           if (typeof val === 'object') {
-            temp.push(JSONBigNumber.stringify(val, null, 4));
+            temp.push(JSONBigNumber.stringify(val, null, 2));
           } else {
             temp.push(val);
           }
         });
         data = '[' + temp.join() + ']';
       }
-      /* if data is string then convert to json*/
-      if ( data != '' && typeof data === 'string'){
-        data = JSON.parse(data);
+      /* set editor content to empty if value is null*/
+      if (_.isNull(data)){
+        defaultValue = '';
+        data = '';
       }
 
       /* Create editor if required & set data*/
       if ($editor){
-        $editor.set(data);
+        $editor.setText(data);
         $editor.focus();
       }else{
         editorInitialized = true;
         require.ensure(['jsoneditor'], function(require) {
           var JSONEditor = require('jsoneditor');
           var jsonContainer = document.getElementById('pg-json-editor');
-          var options = { modes: ['code', 'form', 'tree','preview']};
+          var options = {
+            modes: ['code', 'form', 'tree','preview'],
+            onError: function (){ Alertify.alert(gettext('Please fix errors in json contents before switching mode.'));}
+          };
           $editor = new JSONEditor(jsonContainer, options);
-          $editor.set(data);
+          $editor.setText(data);
           $editor.focus();
         }, function(error){
           throw(error);
@@ -412,9 +413,14 @@ import gettext from 'sources/gettext';
         require.ensure(['jsoneditor'], function(require) {
           var JSONEditor = require('jsoneditor');
           var jsonContainer = document.getElementById('pg-json-editor');
-          var options = {modes: ['code', 'form', 'tree','preview']};
+          var options = {
+            modes: ['code', 'form', 'tree','preview'],
+            onError: function (){Alertify.alert(gettext('Please fix errors in json contents before switching mode.'));}
+          };
           if(jsonContainer) {
             $editor = new JSONEditor(jsonContainer, options);
+            var data = '';
+            $editor.setText(data);
             $editor.focus();
             return null;
           }
@@ -435,7 +441,7 @@ import gettext from 'sources/gettext';
     };
 
     this.applyValue = function(item, state){
-      if(args.column.column_type_internal === 'jsonb' || args.column.column_type_internal === 'json') {
+      if(args.column.column_type_internal === 'jsonb') {
         setValue(args, item, state, 'jsonb');
       } else {
         setValue(args, item, state, 'text');
@@ -447,7 +453,7 @@ import gettext from 'sources/gettext';
       if (data == '' && (_.isUndefined(defaultValue) || _.isNull(defaultValue) )) {
         return false;
       } else {
-        if(! _.isUndefined(defaultValue) && defaultValue != ''){
+        if( args.column.column_type_internal === 'jsonb' && (! _.isUndefined(defaultValue) && defaultValue != '')){
           defaultValue = JSON.stringify(JSON.parse(defaultValue), null,2);
         }
         return (!( data == '' && _.isNull(defaultValue)) && (data != defaultValue));
diff --git a/web/regression/feature_utils/locators.py b/web/regression/feature_utils/locators.py
index 9efe53eda..4c57f344b 100644
--- a/web/regression/feature_utils/locators.py
+++ b/web/regression/feature_utils/locators.py
@@ -188,7 +188,8 @@ class QueryToolLocators:
 
     row_editor_text_area_css = ".pg-text-editor > textarea"
 
-    json_editor_text_area_css = "div.ace_layer.ace_text-layer"
+    json_editor_text_area_css = \
+        "div.ace_layer.ace_text-layer .ace_line_group .ace_line"
 
     text_editor_ok_btn_css = ".btn.btn-primary.long_text_editor"