diff --git a/firmware/application/portapack.cpp b/firmware/application/portapack.cpp
index 99c09162..cacc4f61 100644
--- a/firmware/application/portapack.cpp
+++ b/firmware/application/portapack.cpp
@@ -146,6 +146,8 @@ void init() {
 void shutdown() {
 	sdcStop(&SDCD1);
 
+	display.shutdown();
+	
 	radio::disable();
 	audio_codec.reset();
 	clock_manager.shutdown();
diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp
index ca70a801..56c97283 100644
--- a/firmware/application/ui_navigation.cpp
+++ b/firmware/application/ui_navigation.cpp
@@ -151,7 +151,6 @@ Context& SystemView::context() const {
 
 HackRFFirmwareView::HackRFFirmwareView(NavigationView& nav) {
 	button_yes.on_select = [&nav](Button&){
-		// TODO: Clear screen?
 		portapack::shutdown();
 	};