diff --git a/lib/pods/websocket.dart b/lib/pods/websocket.dart
index 6641cc0c..44bb74f5 100644
--- a/lib/pods/websocket.dart
+++ b/lib/pods/websocket.dart
@@ -156,6 +156,7 @@ class WebSocketService {
   }
 
   void manualReconnect() {
+    _statusStreamController.sink.add(WebSocketState.connecting());
     talker.info('[WebSocket] Manual reconnect triggered by user');
     _reconnectTimer?.cancel();
     _reconnectTimer = Timer(const Duration(milliseconds: 500), () {
diff --git a/lib/widgets/app_scaffold.dart b/lib/widgets/app_scaffold.dart
index 551f8738..56e9d7bf 100644
--- a/lib/widgets/app_scaffold.dart
+++ b/lib/widgets/app_scaffold.dart
@@ -531,7 +531,7 @@ class _WebSocketIndicator extends HookConsumerWidget {
     Color indicatorColor;
     String indicatorText;
     Widget indicatorIcon;
-    bool isInteractive = false;
+    bool isInteractive = true;
     double opacity = 0.0;
 
     if (websocketState == WebSocketState.connected()) {
@@ -544,6 +544,7 @@ class _WebSocketIndicator extends HookConsumerWidget {
         size: 16,
       );
       opacity = 0.0;
+      isInteractive = false;
     } else if (websocketState == WebSocketState.connecting()) {
       indicatorColor = Colors.teal;
       indicatorText = 'connectionReconnecting';
@@ -558,6 +559,7 @@ class _WebSocketIndicator extends HookConsumerWidget {
         ),
       );
       opacity = 1.0;
+      isInteractive = false;
     } else if (websocketState == WebSocketState.serverDown()) {
       indicatorColor = Colors.red;
       indicatorText = 'connectionServerDown';
@@ -579,6 +581,7 @@ class _WebSocketIndicator extends HookConsumerWidget {
         size: 16,
       );
       opacity = 1.0;
+      isInteractive = false;
     }
 
     return Positioned(
@@ -599,15 +602,10 @@ class _WebSocketIndicator extends HookConsumerWidget {
                   ? 0
                   : 4,
               borderRadius: BorderRadius.circular(999),
-              child: InkWell(
-                onTap: isInteractive
-                    ? () {
-                        ref
-                            .read(websocketStateProvider.notifier)
-                            .manualReconnect();
-                      }
-                    : null,
-                borderRadius: BorderRadius.circular(999),
+              child: GestureDetector(
+                onTap: () {
+                  ref.read(websocketStateProvider.notifier).manualReconnect();
+                },
                 child: Container(
                   padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
                   decoration: BoxDecoration(