diff --git a/src/components/TheTopCornerMenu.vue b/src/components/TheTopCornerMenu.vue
index 5f59e037..38ea6d82 100644
--- a/src/components/TheTopCornerMenu.vue
+++ b/src/components/TheTopCornerMenu.vue
@@ -13,21 +13,23 @@
                 </v-btn>
             </template>
             <v-list dense>
-                <v-subheader class="" style="height: auto;">{{ $t("App.TopCornerMenu.KlipperControl") }}</v-subheader>
-                <v-list-item class="minheight30 pr-2" link @click="klipperRestart()">
-                    <v-list-item-title>{{ $t("App.TopCornerMenu.KlipperRestart") }}</v-list-item-title>
-                    <v-list-item-action class="my-0 d-flex flex-row" style="min-width: auto;">
-                        <v-icon class="mr-2" small>mdi-restart</v-icon>
-                    </v-list-item-action>
-                </v-list-item>
-                <v-list-item class="minheight30 pr-2" link @click="klipperFirmwareRestart()">
-                    <v-list-item-title>{{ $t("App.TopCornerMenu.KlipperFirmwareRestart") }}</v-list-item-title>
-                    <v-list-item-action class="my-0 d-flex flex-row" style="min-width: auto;">
-                        <v-icon class="mr-2" small>mdi-restart</v-icon>
-                    </v-list-item-action>
-                </v-list-item>
+                <template v-if="klipperState !== 'disconnected'">
+                    <v-subheader class="" style="height: auto;">{{ $t("App.TopCornerMenu.KlipperControl") }}</v-subheader>
+                    <v-list-item class="minheight30 pr-2" link @click="klipperRestart()">
+                        <v-list-item-title>{{ $t("App.TopCornerMenu.KlipperRestart") }}</v-list-item-title>
+                        <v-list-item-action class="my-0 d-flex flex-row" style="min-width: auto;">
+                            <v-icon class="mr-2" small>mdi-restart</v-icon>
+                        </v-list-item-action>
+                    </v-list-item>
+                    <v-list-item class="minheight30 pr-2" link @click="klipperFirmwareRestart()">
+                        <v-list-item-title>{{ $t("App.TopCornerMenu.KlipperFirmwareRestart") }}</v-list-item-title>
+                        <v-list-item-action class="my-0 d-flex flex-row" style="min-width: auto;">
+                            <v-icon class="mr-2" small>mdi-restart</v-icon>
+                        </v-list-item-action>
+                    </v-list-item>
+                </template>
                 <template v-if="services.length">
-                    <v-divider class="mt-0"></v-divider>
+                    <v-divider class="mt-0" v-if="klipperState !== 'disconnected'"></v-divider>
                     <v-subheader class="pt-2" style="height: auto;">{{ $t("App.TopCornerMenu.ServiceControl") }}</v-subheader>
                     <v-list-item class="minheight30 pr-2" v-for="service in services" v-bind:key="service">
                         <v-list-item-title>
diff --git a/src/components/panels/KlippyStatePanel.vue b/src/components/panels/KlippyStatePanel.vue
index 972b6146..b03db40c 100644
--- a/src/components/panels/KlippyStatePanel.vue
+++ b/src/components/panels/KlippyStatePanel.vue
@@ -58,7 +58,7 @@ export default class KlippyStatePanel extends Mixins(BaseMixin) {
 
     @Watch('klipperState')
     klipperStateChanged(newVal: string) {
-        if (newVal === 'ready') {
+        if (['ready', 'disconnected'].includes(newVal)) {
             if (this.timer) {
                 clearInterval(this.timer)
                 this.timer = null
diff --git a/src/components/panels/MiniconsolePanel.vue b/src/components/panels/MiniconsolePanel.vue
index 333d7bad..08740ed2 100644
--- a/src/components/panels/MiniconsolePanel.vue
+++ b/src/components/panels/MiniconsolePanel.vue
@@ -11,7 +11,7 @@
 
 <template>
     <panel
-        v-if="socketIsConnected"
+        v-if="socketIsConnected && klipperState !== 'disconnected'"
         icon="mdi-console-line"
         :title="$t('Panels.MiniconsolePanel.Headline')"
         :collapsible="true"
diff --git a/src/store/socket/actions.ts b/src/store/socket/actions.ts
index 4871ca16..92de27e2 100644
--- a/src/store/socket/actions.ts
+++ b/src/store/socket/actions.ts
@@ -57,10 +57,12 @@ export const actions: ActionTree<SocketState, RootState> = {
             break
 
         case 'notify_klippy_disconnected':
+            window.console.log('notify disconnected')
             commit('server/setKlippyDisconnected', null, { root: true })
             break
 
         case 'notify_klippy_shutdown':
+            window.console.log('notify shutdown')
             commit('server/setKlippyShutdown', null, { root: true })
             break