diff --git a/lib/msf/ui/gtk2/app.rb b/lib/msf/ui/gtk2/app.rb
index 357d1d5908..4ff348ed04 100644
--- a/lib/msf/ui/gtk2/app.rb
+++ b/lib/msf/ui/gtk2/app.rb
@@ -78,6 +78,10 @@ class MyApp < MyGlade
 		# Initialize the search class
 		ModuleSearch.new(@search_entry, @search_button, @search_cancel_button)
 		
+		# Focus on the search widget
+		@search_entry.can_focus = true
+		@search_entry.grab_focus
+		
 		# Update the StatusBar with all framework modules
 		refresh()
 		
diff --git a/lib/msf/ui/gtk2/frame.rb b/lib/msf/ui/gtk2/frame.rb
index 6ed4ca622c..c24002ecf3 100644
--- a/lib/msf/ui/gtk2/frame.rb
+++ b/lib/msf/ui/gtk2/frame.rb
@@ -89,7 +89,7 @@ class MyModuleTree < MyGlade
 							if (iter.get_value(APP) == "Standard")
 								treeview.selection.select_path(path)
 								active(iter)
-								MsfAssistant.new(@session_tree, iter.get_value(1))
+								MsfAssistant.new(@session_tree, @target_tree, iter.get_value(1))
 							end							
 						end
 					rescue