diff --git a/autoloads/signal_manager.gd b/autoloads/signal_manager.gd
index 7b11d65..80b5ad4 100644
--- a/autoloads/signal_manager.gd
+++ b/autoloads/signal_manager.gd
@@ -4,6 +4,8 @@ extends Node
 
 signal pause_game
 signal resume_game
+signal hide_ui
+signal show_ui
 
 signal open_pause_menu
 signal close_pause_menu
diff --git a/scenes/player/player.gd b/scenes/player/player.gd
index 5bd4c6c..3ef9d0d 100644
--- a/scenes/player/player.gd
+++ b/scenes/player/player.gd
@@ -58,6 +58,8 @@ func _ready() -> void:
 	InventoryManager.quick_slot_item_changed.connect(_on_quick_slot_item_changed)
 	SignalManager.resume_game.connect(_on_resume_game)
 	SignalManager.open_pause_menu.connect(_on_open_pause_menu)
+	SignalManager.hide_ui.connect(_on_hide_ui)
+	SignalManager.show_ui.connect(_on_show_ui)
 
 	_update_held_block_mesh(InventoryManager.quick_slot_item_id)
 
@@ -150,3 +152,10 @@ func _on_open_pause_menu() -> void:
 
 func _on_resume_game() -> void:
 	block_mesh.visible = GameSettingsManager.settings.game_options.enable_held_block
+
+
+func _on_hide_ui() -> void:
+	block_mesh.visible = false
+
+func _on_show_ui() -> void:
+	block_mesh.visible = true and GameSettingsManager.settings.game_options.enable_held_block
diff --git a/scenes/ui/ui.gd b/scenes/ui/ui.gd
index ca3f8fa..c005e6d 100644
--- a/scenes/ui/ui.gd
+++ b/scenes/ui/ui.gd
@@ -12,6 +12,8 @@ func _ready() -> void:
 	SaveGameManager.load_complete.connect(_on_load_complete)
 	SignalManager.pause_game.connect(_on_pause_game)
 	SignalManager.resume_game.connect(_on_resume_game)
+	SignalManager.hide_ui.connect(_on_hide_ui)
+	SignalManager.show_ui.connect(_on_show_ui)
 
 	resume_game()
 
@@ -31,7 +33,7 @@ func hide_ui_elements() -> void:
 func show_ui_elements() -> void:
 	crosshair.visible = true
 	quick_slots.visible = true and GameSettingsManager.settings.game_options.enable_quickslots_ui
-	waila.visible = true
+	waila.visible = true and GameSettingsManager.settings.game_options.enable_waila
 
 
 func pause_game() -> void:
@@ -54,3 +56,11 @@ func _on_pause_game() -> void:
 
 func _on_resume_game() -> void:
 	resume_game()
+
+
+func _on_hide_ui() -> void:
+	hide_menus()
+	hide_ui_elements()
+
+func _on_show_ui() -> void:
+	show_ui_elements()