diff --git a/lib/BoundaryClickWatcher/index.tsx b/lib/BoundaryClickWatcher/index.tsx
index 67c6f06b6..b0ba7b02d 100644
--- a/lib/BoundaryClickWatcher/index.tsx
+++ b/lib/BoundaryClickWatcher/index.tsx
@@ -58,7 +58,7 @@ interface Props {
   isActive?: boolean;
   isFocussed?: boolean;
   BoundaryElement?: string;
-  tabIndex?: number | null;
+  tabIndex?: number;
   outsideClickEventValidator?: (e?: React.MouseEvent) => boolean;
   children:
     | React.ReactNode
diff --git a/lib/Dropdown/DropdownProvider.tsx b/lib/Dropdown/DropdownProvider.tsx
index f228fd01d..981b271ce 100644
--- a/lib/Dropdown/DropdownProvider.tsx
+++ b/lib/Dropdown/DropdownProvider.tsx
@@ -1,8 +1,8 @@
 import React, {
   createContext,
-  useState,
   Dispatch,
   SetStateAction,
+  useState,
 } from "react";
 import cx from "classnames";
 import BoundaryClickWatcher from "../BoundaryClickWatcher";
@@ -101,7 +101,7 @@ function DropdownProvider({
           toggleAndSetShowContent(false);
           onHide();
         }}
-        tabIndex={null}
+        tabIndex={-1}
       >
         {typeof children === "function"
           ? children({