diff --git a/src/components/Editor.jsx b/src/components/Editor.jsx
index c2847f3..c713813 100644
--- a/src/components/Editor.jsx
+++ b/src/components/Editor.jsx
@@ -3,11 +3,11 @@ import { GraphiQL } from 'graphiql';
 import { useDispatch, useSelect } from '@wordpress/data';
 
 import { actions } from '../store/index';
-import PrettifyButton from './toolbarButtons/PrettifyButton';
-import CopyQueryButton from './toolbarButtons/CopyQueryButton';
-import MergeFragmentsButton from './toolbarButtons/MergeFragmentsButton';
-import ShareDocumentButton from './toolbarButtons/ShareDocumentButton';
-import ToggleAuthButton from './toolbarButtons/ToggleAuthButton';
+import { PrettifyButton } from './toolbarButtons/PrettifyButton';
+import { CopyQueryButton } from './toolbarButtons/CopyQueryButton';
+import { MergeFragmentsButton } from './toolbarButtons/MergeFragmentsButton';
+import { ShareDocumentButton } from './toolbarButtons/ShareDocumentButton';
+import { ToggleAuthButton } from './toolbarButtons/ToggleAuthButton';
 
 import 'graphiql/graphiql.min.css';
 
@@ -17,6 +17,7 @@ export function Editor() {
     const shouldRenderStandalone = useSelect(select => select('wpgraphql-ide').shouldRenderStandalone());
     const isAuthenticated = useSelect(select => select('wpgraphql-ide').isAuthenticated());
 
+	console.log({isAuthenticated, shouldRenderStandalone});
     const fetcher = useCallback(async (graphQLParams) => {
         const { graphqlEndpoint } = window.WPGRAPHQL_IDE_DATA;
         const headers = { 'Content-Type': 'application/json' };
@@ -31,10 +32,13 @@ export function Editor() {
         return response.json();
     }, [isAuthenticated]);
 
-	// Correctly handle toggling authentication
 	const handleToggleAuthentication = () => {
 		dispatch(actions.toggleAuthentication());
 	};
+
+	const handleDrawerClose = () => {
+		dispatch(actions.setDrawerOpen(false));
+	};
 	
 	return (
 		<>
@@ -53,7 +57,7 @@ export function Editor() {
 					{ ! shouldRenderStandalone && (
 						<button
 							className="button EditorDrawerCloseButton"
-							onClick={ () => setDrawerOpen( false ) }
+							onClick={handleDrawerClose}
 						>
 							X{ ' ' }
 							<span className="screen-reader-text">
diff --git a/src/store/index.js b/src/store/index.js
index 8acc0e0..ed8c5b0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -41,11 +41,9 @@ const reducer = ( state = initialState, action ) => {
                 },
             };
         case 'TOGGLE_AUTHENTICATION':
-            const isAuthenticated = !state.isAuthenticated;
-            setAuthenticationStateInLocalStorage(isAuthenticated);
             return {
                 ...state,
-                isAuthenticated,
+                isAuthenticated: !state.isAuthenticated,
             };
         default:
             return state;
@@ -83,20 +81,14 @@ const actions = {
             config,
         };
     },
-    toggleAuthentication: () => ({
-        type: 'TOGGLE_AUTHENTICATION',
-    }),
-};
+    toggleAuthentication: () => (dispatch, getState) => {
+        // Dispatch action to toggle authentication state
+        dispatch({ type: 'TOGGLE_AUTHENTICATION' });
 
-const localStorageMiddleware = store => next => action => {
-    if (action.type === 'TOGGLE_AUTHENTICATION') {
-        const nextState = !store.getState().isAuthenticated;
-        
-        setAuthenticationStateInLocalStorage(nextState);
-        next(action);
-    } else {
-        next(action);
-    }
+        // Now, directly handle the side effect using the updated state
+        const newState = getState();
+        setAuthenticationStateInLocalStorage(newState.isAuthenticated);
+    },
 };
 
 const selectors = {
@@ -112,4 +104,4 @@ export const store = createReduxStore( 'wpgraphql-ide', {
     reducer,
     selectors,
     actions,
-}, [ localStorageMiddleware ]);
+});