From cc159d70902d29acdd0dc070649686c080643d72 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Fri, 10 May 2019 00:05:27 -0400
Subject: [PATCH] Fix request switcher active index when only workspaces match

---
 .../app/ui/components/modals/request-switcher-modal.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/insomnia-app/app/ui/components/modals/request-switcher-modal.js b/packages/insomnia-app/app/ui/components/modals/request-switcher-modal.js
index cb2e08533b..bb2ff04393 100644
--- a/packages/insomnia-app/app/ui/components/modals/request-switcher-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/request-switcher-modal.js
@@ -259,7 +259,7 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
 
     this.setState({
       searchString,
-      activeIndex: indexOfFirstNonActiveRequest,
+      activeIndex: indexOfFirstNonActiveRequest >= 0 ? indexOfFirstNonActiveRequest : 0,
       matchedRequests: (matchedRequests: Array<any>).slice(0, maxRequests),
       matchedWorkspaces: matchedWorkspaces.slice(0, maxWorkspaces),
     });