diff --git a/src/g_shared/a_pickups.cpp b/src/g_shared/a_pickups.cpp
index f073499cb..478c64524 100644
--- a/src/g_shared/a_pickups.cpp
+++ b/src/g_shared/a_pickups.cpp
@@ -377,6 +377,8 @@ DEFINE_ACTION_FUNCTION(AActor, A_RestoreSpecialPosition)
 			self->z += FloatBobOffsets[(self->FloatBobPhase + level.maptime) & 63];
 		}
 	}
+	// Redo floor/ceiling check, now with 3D floors
+	P_FindFloorCeiling(self);
 }
 
 int AInventory::StaticLastMessageTic;
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 58b9e9133..d92e50de5 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -2482,7 +2482,6 @@ void P_NightmareRespawn (AActor *mobj)
 
 	z = mo->z;
 
-
 	// inherit attributes from deceased one
 	mo->SpawnPoint[0] = mobj->SpawnPoint[0];
 	mo->SpawnPoint[1] = mobj->SpawnPoint[1];