diff --git a/src/components/AppView/AppView.js b/src/components/AppView/AppView.js
index 75c7c60..1f5c459 100644
--- a/src/components/AppView/AppView.js
+++ b/src/components/AppView/AppView.js
@@ -9,9 +9,11 @@ import ItemViewAppBar from "../ItemViewAppBar/";
 import ItemView from "../ItemView/";
 import QueueSelector from "../QueueSelector/";
 import { useToken } from "../AuthProvider/";
+import { useItem, useItemSetter } from "../ItemProvider/";
 
 export default function AppView({ setDarkMode }){
-	const [activeItem, setActiveItem] = useState({});
+	const activeItem = useItem();
+	const setActiveItem = useItemSetter();
 	const [sidebarOpen, setSidebarOpen] = useState(false);
 	const [queues, setQueues] = useState([]);
 	const [items, setItems] = useState([]);
diff --git a/src/index.js b/src/index.js
index 799ad12..86dc439 100644
--- a/src/index.js
+++ b/src/index.js
@@ -7,6 +7,8 @@ import { CssBaseline } from '@material-ui/core';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { CookiesProvider } from "react-cookie";
 import AuthProvider from "./components/AuthProvider/";
+import ItemProvider from "./components/ItemProvider/";
+
 
 export const history = createBrowserHistory({
   basename: process.env.PUBLIC_URL
@@ -17,9 +19,11 @@ ReactDOM.render(
     <CssBaseline />
       <CookiesProvider>
         <AuthProvider>
-          <Router>
-            <App />
-          </Router>
+          <ItemProvider>
+            <Router>
+              <App />
+            </Router>
+          </ItemProvider>
         </AuthProvider>
       </CookiesProvider>
   </React.StrictMode>,