From 089831b6ee3ccab29721250819033656fa5670d9 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Thu, 12 Jul 2018 14:15:16 -0700
Subject: [PATCH 1/2] Adding potential fix

---
 interface/resources/qml/Browser.qml                     | 1 +
 interface/resources/qml/LoginDialog/LinkAccountBody.qml | 8 ++++++--
 interface/src/ui/LoginDialog.cpp                        | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml
index f0475dfebd..4474cfb2cd 100644
--- a/interface/resources/qml/Browser.qml
+++ b/interface/resources/qml/Browser.qml
@@ -26,6 +26,7 @@ ScrollingWindow {
     y: 100
 
     Component.onCompleted: {
+        focus = true
         shown = true
         addressBar.text = webview.url
     }
diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 814778a4b1..fe971b31ee 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -140,7 +140,9 @@ Item {
                 horizontalAlignment: Text.AlignHCenter
                 linkColor: hifi.colors.blueAccent
 
-                onLinkActivated: loginDialog.openUrl(link)
+                onLinkActivated: {
+                    loginDialog.openUrl(link);
+                }
             }
             onFocusChanged: {
                 root.text = "";
@@ -170,7 +172,9 @@ Item {
                 horizontalAlignment: Text.AlignHCenter
                 linkColor: hifi.colors.blueAccent
 
-                onLinkActivated: loginDialog.openUrl(link)
+                onLinkActivated: {
+                    loginDialog.openUrl(link);
+                }
             }
 
             onFocusChanged: {
diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index 4d8592a9d3..9804c6712a 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -172,11 +172,13 @@ void LoginDialog::openUrl(const QString& url) const {
         offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
             newObject->setProperty("url", url);
         });
+        LoginDialog::hide();
     } else {
         if (!hmd->getShouldShowTablet() && !qApp->isHMDMode()) {
             offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
                 newObject->setProperty("url", url);
             });
+            LoginDialog::hide();
         } else {
             tablet->gotoWebScreen(url);
         }

From 0cbcae9181cb2564d5522bb7c5383739714c47e2 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Wed, 18 Jul 2018 10:44:37 -0700
Subject: [PATCH 2/2] reverting onLinkActivated brackets

---
 interface/resources/qml/LoginDialog/LinkAccountBody.qml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index fe971b31ee..814778a4b1 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -140,9 +140,7 @@ Item {
                 horizontalAlignment: Text.AlignHCenter
                 linkColor: hifi.colors.blueAccent
 
-                onLinkActivated: {
-                    loginDialog.openUrl(link);
-                }
+                onLinkActivated: loginDialog.openUrl(link)
             }
             onFocusChanged: {
                 root.text = "";
@@ -172,9 +170,7 @@ Item {
                 horizontalAlignment: Text.AlignHCenter
                 linkColor: hifi.colors.blueAccent
 
-                onLinkActivated: {
-                    loginDialog.openUrl(link);
-                }
+                onLinkActivated: loginDialog.openUrl(link)
             }
 
             onFocusChanged: {