diff --git a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
index 35a954281..d6af5275b 100644
--- a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
+++ b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
@@ -195,7 +195,8 @@ def register_query_tool_preferences(self):
                  {'label': '\'', 'value': '\''}],
         control_props={
             'allowClear': False,
-            'tags': False
+            'tags': False,
+            'creatable': True,
         }
     )
 
@@ -209,7 +210,8 @@ def register_query_tool_preferences(self):
                  {'label': gettext('Tab'), 'value': '\t'}],
         control_props={
             'allowClear': False,
-            'tags': False
+            'tags': False,
+            'creatable': True,
         }
     )
 
diff --git a/web/pgadmin/utils/preferences.py b/web/pgadmin/utils/preferences.py
index e07424cb7..c509b019f 100644
--- a/web/pgadmin/utils/preferences.py
+++ b/web/pgadmin/utils/preferences.py
@@ -147,6 +147,10 @@ class _Preference(object):
             for opt in self.options:
                 if 'value' in opt and opt['value'] == res.value:
                     return True, res.value
+
+            if self.control_props and self.control_props['creatable']:
+                return True, res.value
+
             if self.select and self.select['tags']:
                 return True, res.value
             return True, self.default
@@ -191,7 +195,9 @@ class _Preference(object):
                 has_value = next((True for opt in self.options
                                   if 'value' in opt and opt['value'] == value),
                                  False)
-                assert (has_value or (self.select and self.select['tags']))
+                assert (has_value or (self.control_props and
+                                      (self.control_props['tags'] or
+                                       self.control_props['creatable'])))
             elif self._type == 'date':
                 value = parser_map[self._type](value).date()
             else: