diff --git a/web/app.react.js b/web/app.react.js
--- a/web/app.react.js
+++ b/web/app.react.js
@@ -26,6 +26,7 @@
 import AppsDirectory from './apps/apps-directory.react';
 import Calendar from './calendar/calendar.react';
 import Chat from './chat/chat.react';
+import { TooltipProvider } from './chat/tooltip-provider';
 import NavigationArrows from './components/navigation-arrows.react';
 import InputStateContainer from './input/input-state-container.react';
 import LoadingIndicator from './loading-indicator.react';
@@ -139,12 +140,14 @@
     }
     return (
       <DndProvider backend={HTML5Backend}>
-        <MenuProvider>
-          <FocusHandler />
-          <VisibilityHandler />
-          {content}
-          {this.props.modals}
-        </MenuProvider>
+        <TooltipProvider>
+          <MenuProvider>
+            <FocusHandler />
+            <VisibilityHandler />
+            {content}
+            {this.props.modals}
+          </MenuProvider>
+        </TooltipProvider>
       </DndProvider>
     );
   }