diff --git a/code/modules/spells/targeted/mind_transfer.dm b/code/modules/spells/targeted/mind_transfer.dm
index a3668a53d1d..1f20e6afbf8 100644
--- a/code/modules/spells/targeted/mind_transfer.dm
+++ b/code/modules/spells/targeted/mind_transfer.dm
@@ -48,13 +48,15 @@
 				victim.verbs -= V
 
 		var/mob/dead/observer/ghost = victim.ghostize(0)
-		ghost.spell_list = victim.spell_list//If they have spells, transfer them. Now we basically have a backup mob.
+		ghost.spell_list += victim.spell_list//If they have spells, transfer them. Now we basically have a backup mob.
 
 		caster.mind.transfer_to(victim)
-		victim.spell_list = list() //clear those out
-		for(var/spell/S in caster.spell_list)
-			victim.add_spell(S) //Now they are inside the victim's body - this also generates the HUD
-		caster.spell_list = list() //clean that out as well
+		for(var/spell/S in victim.spell_list) //get rid of spells the new way
+			victim.remove_spell(S) //This will make it so that players will not get the HUD and all that spell bugginess that caused copies of spells and stuff of that nature.
+
+		for(var/spell/S in caster.spell_list)
+			victim.add_spell(S) //Now they are inside the victim's body - this also generates the HUD
+			caster.remove_spell(S) //remove the spells from the caster
 
 		if(victim.mind.special_verbs.len)//To add all the special verbs for the original caster.
 			for(var/V in caster.mind.special_verbs)//Not too important but could come into play.
@@ -62,9 +64,9 @@
 
 		ghost.mind.transfer_to(caster)
 		caster.key = ghost.key	//have to transfer the key since the mind was not active
-		for(var/spell/S in ghost.spell_list)
-			caster.add_spell(S)
-		ghost.spell_list = list()
+		for(var/spell/S in ghost.spell_list)
+			caster.add_spell(S)
+		ghost.spell_list = list()
 
 		if(caster.mind.special_verbs.len)//If they had any special verbs, we add them here.
 			for(var/V in caster.mind.special_verbs)
@@ -76,4 +78,4 @@
 
 		//After a certain amount of time the victim gets a message about being in a different body.
 		spawn(msg_wait)
-			caster << "<span class='danger'>You feel woozy and lightheaded. Your body doesn't seem like your own.</span>"
+			caster << "<span class='danger'>You feel woozy and lightheaded. Your body doesn't seem like your own.</span>"