diff --git a/src/driver/core/SideBar.ts b/src/driver/core/SideBar.ts
index 10ef1b7..97d6a51 100644
--- a/src/driver/core/SideBar.ts
+++ b/src/driver/core/SideBar.ts
@@ -53,6 +53,7 @@ export const init: BoundMethodCreator = dispatch => async () => {
       dispatch.set({ disabled: true })
       return
     }
+    DOMHelper.markGitakoReadyState(true)
     dispatch.set({
       errorDueToAuth: false,
       showSettings: false,
@@ -120,7 +121,6 @@ export const init: BoundMethodCreator = dispatch => async () => {
     const shouldShow =
       intelligentToggle === null ? URLHelper.isInCodePage(metaData) : intelligentToggle
     dispatch.call(setShouldShow, shouldShow)
-    DOMHelper.markGitakoReadyState()
   } catch (err) {
     dispatch.call(handleError, err)
   } finally {
@@ -141,6 +141,7 @@ export const handleError: BoundMethodCreator<[Error]> = dispatch => async err =>
     dispatch.set({ errorDueToAuth: true })
     dispatch.call(setShowSettings, true)
   } else {
+    DOMHelper.markGitakoReadyState(false)
     dispatch.call(setError, 'Gitako ate a bug, but it should recovery soon!')
     throw err
   }
diff --git a/src/utils/DOMHelper.ts b/src/utils/DOMHelper.ts
index 3be70e8..c072c4b 100644
--- a/src/utils/DOMHelper.ts
+++ b/src/utils/DOMHelper.ts
@@ -13,10 +13,13 @@ NProgress.configure({ showSpinner: false })
 
 /**
  * when gitako is ready, make page's header narrower
+ * or cancel it
  */
-export function markGitakoReadyState() {
+export function markGitakoReadyState(ready: boolean) {
   const readyClassName = 'gitako-ready'
-  document.body.classList.add(readyClassName)
+  const classList = document.body.classList
+  if (ready) classList.add(readyClassName)
+  else classList.remove(readyClassName)
 }
 
 /**