diff --git a/addons/escoria-core/game/core-scripts/esc_background.gd b/addons/escoria-core/game/core-scripts/esc_background.gd
index 3c606c53..e07ae6f7 100644
--- a/addons/escoria-core/game/core-scripts/esc_background.gd
+++ b/addons/escoria-core/game/core-scripts/esc_background.gd
@@ -82,7 +82,7 @@ func _ready():
 #
 # #### Parameters
 # - event: Event received
-func _input(event) -> void:
+func _unhandled_input(event) -> void:
 	if not escoria.current_state == escoria.GAME_STATE.DEFAULT:
 		return
 	if InputMap.has_action("switch_action_verb") \
diff --git a/addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd b/addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd
index 02807fd6..d5c9f9ed 100644
--- a/addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd
+++ b/addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd
@@ -34,9 +34,10 @@ func _ready():
 #
 # - event: The input event
 func _input(event):
-	if event is InputEventMouseButton and \
-			event.pressed:
+	if event is InputEventMouseButton and event.pressed \
+			and is_speaking:
 		speedup()
+		get_tree().set_input_as_handled()
 		
 
 # Find the matching voice output file for the given key
diff --git a/project.godot b/project.godot
index 9c3c677f..c9094852 100644
--- a/project.godot
+++ b/project.godot
@@ -673,7 +673,7 @@ search_in_file_extensions=PoolStringArray( "gd", "shader", "esc" )
 
 [editor_plugins]
 
-enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-dialog-simple/plugin.cfg", "res://addons/escoria-ui-9verbs/plugin.cfg" )
+enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-dialog-simple/plugin.cfg", "res://addons/escoria-ui-simplemouse/plugin.cfg" )
 
 [escoria]
 
@@ -682,7 +682,7 @@ main/force_quit=true
 debug/terminate_on_warnings=false
 debug/terminate_on_errors=true
 debug/development_lang="en"
-ui/tooltip_follows_mouse=false
+ui/tooltip_follows_mouse=true
 main/text_lang="fr_FR"
 main/voice_lang="fr_FR"
 sound/music_volume=1
@@ -699,7 +699,7 @@ main/savegames_path="res://saves/"
 main/settings_path="user://"
 main/escoria_version=""
 sound/speech_enabled=1
-ui/game_scene="res://addons/escoria-ui-9verbs/game.tscn"
+ui/game_scene="res://addons/escoria-ui-simplemouse/game.tscn"
 ui/dialogs_chooser="res://addons/escoria-core/ui_library/dialogs/text_dialog_chooser.tscn"
 sound/speech_folder="res://game/speech"
 sound/speech_extension="ogg"