diff --git a/lib/msf/ui/console/command_dispatcher/core.rb b/lib/msf/ui/console/command_dispatcher/core.rb
index 6f072bf9f6..ffcf33d13c 100644
--- a/lib/msf/ui/console/command_dispatcher/core.rb
+++ b/lib/msf/ui/console/command_dispatcher/core.rb
@@ -103,7 +103,9 @@ class Core
 		    driver.current_dispatcher.name != 'Core')
 			# Reset the active module if we have one
 			if (active_module)
-				active_module.reset_ui
+				
+				# Do NOT reset the UI anymore
+				# active_module.reset_ui
 
 				# Save the module's datastore so that we can load it later 
 				# if the module is used again
diff --git a/lib/msf/ui/console/command_dispatcher/exploit.rb b/lib/msf/ui/console/command_dispatcher/exploit.rb
index b6b8368409..2aa3965e83 100644
--- a/lib/msf/ui/console/command_dispatcher/exploit.rb
+++ b/lib/msf/ui/console/command_dispatcher/exploit.rb
@@ -67,8 +67,6 @@ class Exploit
 			end
 		rescue
 			log_error("Check failed: #{$!}")
-		ensure
-			mod.reset_ui
 		end
 	end