diff --git a/rbtools/utils/console.py b/rbtools/utils/console.py
index 37d72ebafad85d0c683340c24354d072c2aa82d7..3c6370f135fe968b805b9a3e784105f67f17ea65 100644
--- a/rbtools/utils/console.py
+++ b/rbtools/utils/console.py
@@ -26,11 +26,11 @@ def edit_text(content):
     The environment's default text editor is used if available, otherwise
     vim is used.
     """
-    tempfile = make_tempfile(content)
+    tempfile = make_tempfile(content.encode('utf8'))
     editor = os.environ.get('EDITOR', 'vim')
     subprocess.call([editor, tempfile])
     f = open(tempfile)
     result = f.read()
     f.close()
 
-    return result
+    return result.decode('utf8')