diff --git a/firmware/application/apps/ui_fileman.cpp b/firmware/application/apps/ui_fileman.cpp
index 9097d602..9271bc92 100644
--- a/firmware/application/apps/ui_fileman.cpp
+++ b/firmware/application/apps/ui_fileman.cpp
@@ -263,28 +263,32 @@ void FileManagerView::on_rename(NavigationView& nav) {
 }
 
 void FileManagerView::on_refactor(NavigationView& nav) {
-    text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) {
-        std::string destination_path = current_path.string();
-        if (destination_path.back() != '/')
-            destination_path += '/';
-        destination_path = destination_path + buffer;
-        rename_file(get_selected_path(), destination_path);  //rename the selected file
+	text_prompt(nav, name_buffer, max_filename_length, [this](std::string& buffer) {
+		std::string destination_path = current_path.string();
+		if (destination_path.back() != '/')
+			destination_path += '/';
+		destination_path = destination_path + buffer;
 
-        if (get_selected_path().extension().string().substr(1) == "C16") {//rename it's partner ( C16 <-> TXT ) file.
-            auto selected_path = get_selected_path();
-            auto partner_file_path = selected_path.string().substr(0, selected_path.string().size()-4) + ".TXT";
-            destination_path = destination_path.substr(0, destination_path.size()-4) + ".TXT";
-            rename_file(partner_file_path, destination_path);
-        }else if (get_selected_path().extension().string().substr(1) == "TXT") {//If the file user choose is a TXT file
-            auto selected_path = get_selected_path();
-            auto partner_file_path = selected_path.string().substr(0, selected_path.string().size()-4) + ".C16";
-            destination_path = destination_path.substr(0, destination_path.size()-4) + ".C16";
-            rename_file(partner_file_path, destination_path);
-        }
+		rename_file(get_selected_path(), destination_path);  //rename the selected file
 
-        load_directory_contents(current_path);
-        refresh_list();
-    });
+		auto selected_path = get_selected_path();
+		auto extension = selected_path.extension().string();
+
+		if (!extension.empty() && selected_path.string().back() != '/' && extension.substr(1) == "C16") {
+			// Rename its partner ( C16 <-> TXT ) file.
+			auto partner_file_path = selected_path.string().substr(0, selected_path.string().size() - 4) + ".TXT";
+			destination_path = destination_path.substr(0, destination_path.size() - 4) + ".TXT";
+			rename_file(partner_file_path, destination_path);
+		} else if (!extension.empty() && selected_path.string().back() != '/' && extension.substr(1) == "TXT") {
+			// If the file user choose is a TXT file.
+			auto partner_file_path = selected_path.string().substr(0, selected_path.string().size() - 4) + ".C16";
+			destination_path = destination_path.substr(0, destination_path.size() - 4) + ".C16";
+			rename_file(partner_file_path, destination_path);
+		}
+
+		load_directory_contents(current_path);
+		refresh_list();
+	});
 }
 
 void FileManagerView::on_delete() {
diff --git a/firmware/application/apps/ui_fileman.hpp b/firmware/application/apps/ui_fileman.hpp
index ea2b90cc..261295e8 100644
--- a/firmware/application/apps/ui_fileman.hpp
+++ b/firmware/application/apps/ui_fileman.hpp
@@ -159,7 +159,7 @@ private:
 	};
 
 	Button button_rename {
-		{ 0 * 8, 29 * 8, 10 * 8, 32 },
+		{ 0 * 8, 29 * 8, 9 * 8, 32 },
 		"Rename"
 	};
 
@@ -169,7 +169,7 @@ private:
 	};
 
 	Button button_delete {
-		{ 20 * 8, 29 * 8, 10 * 8, 32 },
+		{ 21 * 8, 29 * 8, 9 * 8, 32 },
 		"Delete"
 	};