diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm
index 81a52770bc..fd5451e65a 100644
--- a/code/datums/components/storage/storage.dm
+++ b/code/datums/components/storage/storage.dm
@@ -327,7 +327,7 @@
 	if(check_locked())
 		close_all()
 
-/datui_um/component/storage/proc/close(mob/M)
+/datum/component/storage/proc/close(mob/M)
 	ui_hide(M)
 
 /datum/component/storage/proc/close_all()
diff --git a/code/datums/components/storage/ui.dm b/code/datums/components/storage/ui.dm
index c062922700..a5c2a787f5 100644
--- a/code/datums/components/storage/ui.dm
+++ b/code/datums/components/storage/ui.dm
@@ -106,6 +106,7 @@
 
 	// define outside for marginal performance boost
 	var/obj/item/I
+	var/pixel = 0
 	for(var/i in percentage_by_item)
 		I = i
 		var/percent = percentage_by_item[I]
@@ -131,6 +132,8 @@
 		var/xshift = FLOOR(pixel / icon_size, 1)
 		var/px = pixel % world.icon_Size
 		B.screen_loc = I.screen_loc = "[screen_start_x + xshift]:[px + px_add],[screen_start_y+rows-1]:[screen_pixel_y]"
+		// add the used pixels to pixel after we place the object
+		pixel += pixels_to_use
 
 		// finally add our things.
 		. += B
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 266d5b5bb5..44a891e24a 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -584,11 +584,8 @@
 		stoplag(1)
 	qdel(progress)
 	to_chat(user, "<span class='notice'>You dump as much of [src_object.parent]'s contents into [STR.insert_preposition]to [src] as you can.</span>")
-	STR.orient2hud(user)
-	src_object.orient2hud(user)
 	if(user.active_storage) //refresh the HUD to show the transfered contents
-		user.active_storage.close(user)
-		user.active_storage.show_to(user)
+		user.active_storage.ui_show(user)
 	return TRUE
 
 /atom/proc/get_dumping_location(obj/item/storage/source,mob/user)