diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py
index 6be9e0b..5020b80 100644
--- a/web/pgadmin/tools/sqleditor/__init__.py
+++ b/web/pgadmin/tools/sqleditor/__init__.py
@@ -611,6 +611,7 @@ def poll(trans_id):
                         col_type = dict()
                         col_type['type_code'] = col['type_code']
                         col_type['type_name'] = None
+                        col_type['internal_size'] = col['internal_size']
                         columns[col['name']] = col_type
 
                         if rset:
@@ -632,6 +633,20 @@ def poll(trans_id):
                             if col_type['oid'] == col_info['type_code']:
                                 col_info['type_name'] = col_type['typname']
 
+                                # If column is of type character, character[],
+                                # character varying and character varying[]
+                                # then add internal size to it's name for the
+                                # correct sql query.
+                                if col_info['type_name'] == "character" \
+                                    or col_info['type_name'] == "character[]" \
+                                    or col_info['type_name'] == \
+                                        "character varying" \
+                                    or col_info['type_name'] == \
+                                        "character varying[]":
+                                    col_info['type_name'] = \
+                                        col_type['typname'] + '(' + \
+                                        str(col_info['internal_size']) + ')'
+
                     session_obj['columns_info'] = columns
                 # status of async_fetchmany_2darray is True and result is none
                 # means nothing to fetch
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index 3b74559..6052deb 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -2373,6 +2373,8 @@ define('tools.querytool', [
 
                     // Clear msgs after successful save
                     $('.sql-editor-message').html('');
+
+                  alertify.success(gettext("Data saved successfully."));
                 } else {
                   // Something went wrong while saving data on the db server
                   $("#btn-flash").prop('disabled', false);
@@ -2413,7 +2415,6 @@ define('tools.querytool', [
               self.trigger('pgadmin-sqleditor:loading-icon:hide');
 
                 grid.invalidate();
-                alertify.success(gettext("Data saved successfully."));
                 if (self.close_on_save) {
                   self.close();
                 }