diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 6472349..7914b92 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -2973,6 +2973,12 @@
 	}
 }
 
+void TWPartitionManager::Override_Active_Slot(const string& Slot) {
+	LOGINFO("Overriding slot to '%s'\n", Slot.c_str());
+	Active_Slot_Display = Slot;
+	DataManager::SetValue("tw_active_slot", Slot);
+}
+
 void TWPartitionManager::Set_Active_Slot(const string& Slot) {
 	if (Slot != "A" && Slot != "B") {
 		LOGERR("Set_Active_Slot invalid slot '%s'\n", Slot.c_str());
diff --git a/partitions.hpp b/partitions.hpp
index dba9be8..4840566 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -368,6 +368,7 @@
 	bool Flash_Image(string& path, string& filename);                         // Flashes an image to a selected partition from the partition list
 	bool Restore_Partition(struct PartitionSettings *part_settings);          // Restore the partitions based on type
 	TWAtomicInt stop_backup;
+	void Override_Active_Slot(const string& Slot);                            // Override the active slot for repacking
 	void Set_Active_Slot(const string& Slot);                                 // Sets the active slot to A or B
 	string Get_Active_Slot_Suffix();                                          // Returns active slot _a or _b
 	string Get_Active_Slot_Display();                                         // Returns active slot A or B for display purposes
diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
index 83ae973..aff242a 100755
--- a/twrpRepacker.cpp
+++ b/twrpRepacker.cpp
@@ -197,9 +197,9 @@
 		LOGINFO("Switching slots to flash ramdisk to both partitions\n");
 		string Current_Slot = PartitionManager.Get_Active_Slot_Display();
 		if (Current_Slot == "A")
-			PartitionManager.Set_Active_Slot("B");
+			PartitionManager.Override_Active_Slot("B");
 		else
-			PartitionManager.Set_Active_Slot("A");
+			PartitionManager.Override_Active_Slot("A");
 		DataManager::SetProgress(.25);
 		if (!Backup_Image_For_Repack(part, REPACK_ORIG_DIR, Repack_Options.Backup_First, gui_lookup("repack", "Repack")))
 			return false;
@@ -243,8 +243,4 @@
 		}
 		DataManager::SetProgress(1);
 		TWFunc::removeDir(REPACK_ORIG_DIR, false);
-		PartitionManager.Set_Active_Slot(Current_Slot);
-	}
-	TWFunc::removeDir(REPACK_NEW_DIR, false);
-	return true;
 }