diff --git a/vanilla_installer/defaults/disk.py b/vanilla_installer/defaults/disk.py
index 8b4ed2fc..7fb0bc64 100644
--- a/vanilla_installer/defaults/disk.py
+++ b/vanilla_installer/defaults/disk.py
@@ -83,7 +83,10 @@ def __init__(self, page, parent, partition, modifiable, default_fs, **kwargs):
             self.__add_dropdown()
 
     def __add_dropdown(self):
-        fs_dropdown = Gtk.DropDown.new_from_strings(self.__partition_fs_types)
+        if self.__partition.fs_type in self.__partition_fs_types:
+            fs_dropdown = Gtk.DropDown.new_from_strings(["unformatted"] + self.__partition_fs_types)
+        else:
+            fs_dropdown = Gtk.DropDown.new_from_strings(self.__partition_fs_types)
         fs_dropdown.set_valign(Gtk.Align.CENTER)
         fs_dropdown.set_visible(False)
 
diff --git a/vanilla_installer/utils/processor.py b/vanilla_installer/utils/processor.py
index 4488264c..664e296e 100644
--- a/vanilla_installer/utils/processor.py
+++ b/vanilla_installer/utils/processor.py
@@ -335,6 +335,9 @@ def setup_partition(
             ):
                 mountpoints.append([part, values["mp"]])
                 if values["fs"] == "unformatted":
+                    operation = "setlabel"
+                    format_args = [part_number, part_name]
+                    setup_steps.append([part_disk, operation, format_args])
                     return
                 format_args = [part_number, values["fs"]]
                 if encrypt: