From 0e53fa3f8b8a2edb850652e8b461b967a7669fd2 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 29 Aug 2018 12:05:46 -0700
Subject: [PATCH] only focus with selection

---
 scripts/system/edit.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index b086b5624c..e340c75a8b 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1892,8 +1892,10 @@ function toggleKey(value) {
 function focusKey(value) {
     if (value === 0) { // on release
         cameraManager.enable();
-        cameraManager.focus(selectionManager.worldPosition, selectionManager.worldDimensions, 
-                            Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
+        if (selectionManager.hasSelection()) {
+            cameraManager.focus(selectionManager.worldPosition, selectionManager.worldDimensions, 
+                                Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
+        }
     }
 }
 function gridKey(value) {