diff --git a/mist/graphics_octagon/Makefile b/mist/graphics_octagon/Makefile
index 6dedff22..5c9d6ece 100644
--- a/mist/graphics_octagon/Makefile
+++ b/mist/graphics_octagon/Makefile
@@ -52,7 +52,8 @@ octagon_graphics.inc:	\
 	red_book_ending.lzsa blue_book_ending.lzsa \
 	fireplace_shelf.lzsa \
 	green_book.lzsa green_book_open.lzsa \
-	dni_n.lzsa dni_s.lzsa dni_e.lzsa dni_w.lzsa
+	dni_n.lzsa dni_s.lzsa dni_e.lzsa dni_w.lzsa \
+	dni_desk_n.lzsa dni_desk_s.lzsa
 	echo "temple_door_n_lzsa: .incbin \"temple_door_n.lzsa\"" > octagon_graphics.inc
 	echo "temple_door_s_lzsa: .incbin \"temple_door_s.lzsa\"" >> octagon_graphics.inc
 	echo "temple_door_closed_s_lzsa: .incbin \"temple_door_closed_s.lzsa\"" >> octagon_graphics.inc
@@ -131,6 +132,8 @@ octagon_graphics.inc:	\
 	echo "dni_s_lzsa: .incbin \"dni_s.lzsa\"" >> octagon_graphics.inc
 	echo "dni_e_lzsa: .incbin \"dni_e.lzsa\"" >> octagon_graphics.inc
 	echo "dni_w_lzsa: .incbin \"dni_w.lzsa\"" >> octagon_graphics.inc
+	echo "dni_desk_n_lzsa: .incbin \"dni_desk_n.lzsa\"" >> octagon_graphics.inc
+	echo "dni_desk_s_lzsa: .incbin \"dni_desk_s.lzsa\"" >> octagon_graphics.inc
 
 %.gr: %.png
 	$(PNG2GR) $< $@
diff --git a/mist/graphics_octagon/dni_desk_n.png b/mist/graphics_octagon/dni_desk_n.png
new file mode 100644
index 00000000..800aa6b1
Binary files /dev/null and b/mist/graphics_octagon/dni_desk_n.png differ
diff --git a/mist/graphics_octagon/dni_desk_s.png b/mist/graphics_octagon/dni_desk_s.png
new file mode 100644
index 00000000..b63da32a
Binary files /dev/null and b/mist/graphics_octagon/dni_desk_s.png differ
diff --git a/mist/leveldata_octagon.inc b/mist/leveldata_octagon.inc
index 24c8bc79..f0daa9b5 100644
--- a/mist/leveldata_octagon.inc
+++ b/mist/leveldata_octagon.inc
@@ -716,11 +716,11 @@ location37:
 
 ; OCTAGON_DNI	-- deep underneath New Mexico
 location38:
-	.byte	$ff			; north exit
+	.byte	OCTAGON_DNI_DESK	; north exit
 	.byte	$ff			; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
-	.byte	$ff		; north exit_dir
+	.byte	DIRECTION_N	; north exit_dir
 	.byte	$ff		; south exit_dir
 	.byte	$ff		; east exit_dir
 	.byte	$ff		; west exit_dir
@@ -734,16 +734,16 @@ location38:
 ; OCTAGON_DNI_DESK	-- Atrus' desk
 location39:
 	.byte	$ff			; north exit
-	.byte	$ff			; south exit
+	.byte	OCTAGON_DNI		; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
 	.byte	$ff		; north exit_dir
-	.byte	$ff		; south exit_dir
+	.byte	DIRECTION_E	; south exit_dir
 	.byte	$ff		; east exit_dir
 	.byte	$ff		; west exit_dir
-	.word	dni_n_lzsa			; north bg
-	.word	dni_s_lzsa			; south bg
-	.word	dni_e_lzsa			; east bg
-	.word	dni_w_lzsa			; west bg
-	.byte	BG_EAST|BG_WEST|BG_SOUTH|BG_NORTH
+	.word	dni_desk_n_lzsa			; north bg
+	.word	dni_desk_s_lzsa			; south bg
+	.word	$0000				; east bg
+	.word	$0000			; west bg
+	.byte	BG_SOUTH|BG_NORTH
 	.byte	$ff		; special exit