1 files changed, 9 insertions, 7 deletions

diff --git a/archinstall/lib/user_interaction/subvolume_config.py b/archinstall/lib/user_interaction/subvolume_config.py
index 0515876b..adbb7430 100644
--- a/archinstall/lib/user_interaction/subvolume_config.py
+++ b/archinstall/lib/user_interaction/subvolume_config.py
@@ -1,9 +1,10 @@
-from typing import List, Any, Dict
+from typing import Any, Dict
 
 from ..menu.list_manager import ListManager
 from ..menu.selection_menu import Selector, GeneralMenu
 from ..menu.text_input import TextInput
 from ..menu import Menu
+
 """
 UI classes
 """
@@ -14,7 +15,7 @@ class SubvolumeList(ListManager):
 		self.ObjectDefaultAction = str(_('Add'))
 		super().__init__(prompt,list,None,self.ObjectNullAction,self.ObjectDefaultAction)
 
-	def reformat(self, data: Any) -> List[Any]:
+	def reformat(self, data: Dict) -> Dict:
 		def presentation(key :str, value :Dict):
 			text = _(" Subvolume :{:16}").format(key)
 			if isinstance(value,str):
@@ -28,14 +29,15 @@ class SubvolumeList(ListManager):
 					text += _(" with option {}").format(', '.join(value['options']))
 			return text
 
-		return sorted(list(map(lambda x:presentation(x,data[x]),data)))
+		formatted = {presentation(k, v): k for k, v in data.items()}
+		return {k: v for k, v in sorted(formatted.items(), key=lambda e: e[0])}
 
 	def action_list(self):
 		return super().action_list()
 
-	def exec_action(self, data: Any):
+	def exec_action(self, data: Dict):
 		if self.target:
-			origkey,origval = list(self.target.items())[0]
+			origkey, origval = list(self.target.items())[0]
 		else:
 			origkey = None
 
@@ -46,8 +48,8 @@ class SubvolumeList(ListManager):
 				self.target = {}
 				print(_('\n Fill the desired values for a new subvolume \n'))
 				with SubvolumeMenu(self.target,self.action) as add_menu:
-					for data in ['name','mountpoint','options']:
-						add_menu.exec_option(data)
+					for elem in ['name','mountpoint','options']:
+						add_menu.exec_option(elem)
 			else:
 				SubvolumeMenu(self.target,self.action).run()