diff --git a/src/core/widgets/code/command_system/command_helpers.py b/src/core/widgets/code/command_system/command_helpers.py
index c947082..92a1786 100644
--- a/src/core/widgets/code/command_system/command_helpers.py
+++ b/src/core/widgets/code/command_system/command_helpers.py
@@ -9,7 +9,7 @@ from gi.repository import GtkSource
 
 def set_language_and_style(view, file):
     language   = view.language_manager.guess_language(file.fname, None)
-    file.ftype = language
+    file.ftype = "buffer" if not language else language
     file.buffer.set_language(language)
     file.buffer.set_style_scheme(view.syntax_theme)
 
diff --git a/src/core/widgets/code/command_system/commands/new_file.py b/src/core/widgets/code/command_system/commands/new_file.py
index 8360b16..13b838d 100644
--- a/src/core/widgets/code/command_system/commands/new_file.py
+++ b/src/core/widgets/code/command_system/commands/new_file.py
@@ -18,7 +18,7 @@ def execute(
 ):
     logger.debug("Command: New File")
 
-    file       = view.command.new_file(view)
+    file = view.command.new_file(view)
     set_language_and_style(view, file)
 
     view.set_buffer(file.buffer)