diff --git a/plugins/generic/custom.py b/plugins/generic/custom.py
index 5a64f148f..62948c656 100644
--- a/plugins/generic/custom.py
+++ b/plugins/generic/custom.py
@@ -6,12 +6,13 @@ See the file 'doc/COPYING' for copying permission
 """
 
 import re
+import sys
 
 from lib.core.common import Backend
 from lib.core.common import dataToStdout
 from lib.core.common import getSQLSnippet
+from lib.core.common import getUnicode
 from lib.core.common import isStackingAvailable
-from lib.core.convert import utf8decode
 from lib.core.data import conf
 from lib.core.data import logger
 from lib.core.dicts import SQL_STATEMENTS
@@ -81,7 +82,7 @@ class Custom:
 
             try:
                 query = raw_input("sql-shell> ")
-                query = utf8decode(query)
+                query = getUnicode(query, encoding=sys.stdin.encoding)
             except KeyboardInterrupt:
                 print
                 errMsg = "user aborted"