From b68837277cd1e62c2c928e988edba58656e8b7eb Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 18 Feb 2016 22:12:43 +1300
Subject: [PATCH] Fix default focus

---
 interface/resources/qml/hifi/dialogs/RunningScripts.qml | 5 +++++
 interface/resources/qml/windows-uit/Window.qml          | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/dialogs/RunningScripts.qml b/interface/resources/qml/hifi/dialogs/RunningScripts.qml
index c1421c41bc..55b8946805 100644
--- a/interface/resources/qml/hifi/dialogs/RunningScripts.qml
+++ b/interface/resources/qml/hifi/dialogs/RunningScripts.qml
@@ -46,6 +46,11 @@ Window {
 
     Component.onCompleted: updateRunningScripts()
 
+    function setDefaultFocus() {
+        // Work around FocusScope of scrollable window.
+        filterEdit.forceActiveFocus();
+    }
+
     function updateRunningScripts() {
         var runningScripts = ScriptDiscoveryService.getRunning();
         runningScriptsModel.clear()
diff --git a/interface/resources/qml/windows-uit/Window.qml b/interface/resources/qml/windows-uit/Window.qml
index ab73566bcf..36d083dfc6 100644
--- a/interface/resources/qml/windows-uit/Window.qml
+++ b/interface/resources/qml/windows-uit/Window.qml
@@ -199,7 +199,7 @@ Fadable {
 
     children: [ swallower, frame, pane, activator ]
 
-    Component.onCompleted: raise();
+    Component.onCompleted: { raise(); setDefaultFocus(); }
     Component.onDestruction: windowDestroyed();
     onParentChanged: raise();