diff --git a/resources/js/runtime-logs.js b/resources/js/runtime-logs.js
index ad50b2ffbf..c5ff280f33 100644
--- a/resources/js/runtime-logs.js
+++ b/resources/js/runtime-logs.js
@@ -158,6 +158,9 @@ export function initializeRuntimeLogsComponent() {
             containerName: config.containerName ?? 'logs',
             findShortcutLabel: /Mac|iPhone|iPad/.test(navigator.platform) ? '⌘F' : 'Ctrl+F',
             logsLoaded: false,
+            allLines: false,
+            loadingAll: false,
+            loadingLines: false,
             loading: false,
             fullscreen: false,
             alwaysScroll: false,
@@ -178,6 +181,7 @@ export function initializeRuntimeLogsComponent() {
             scrollMargin: 0,
 
             init() {
+                this.allLines = Number(this.$wire.numberOfLines) === -1;
                 this.$watch('searchQuery', () => this.applyFilters());
                 this.$nextTick(() => this.mountVirtualizer());
                 streamTimer = setInterval(() => this.streamTick(), STREAM_INTERVAL_MS);
@@ -257,13 +261,26 @@ export function initializeRuntimeLogsComponent() {
                 }
             },
 
+            async refreshLines() {
+                if (this.loading) return;
+                this.loadingLines = true;
+                try {
+                    await this.refresh();
+                } finally {
+                    this.loadingLines = false;
+                }
+            },
+
             async showAllLogs() {
                 if (this.loading) return;
                 this.loading = true;
+                this.loadingAll = true;
                 try {
                     this.replaceLines(await this.$wire.showAllLogs());
+                    this.allLines = true;
                 } finally {
                     this.loading = false;
+                    this.loadingAll = false;
                 }
             },
 
diff --git a/resources/views/livewire/project/shared/get-logs.blade.php b/resources/views/livewire/project/shared/get-logs.blade.php
index 407e2da96b..2fad7cfa7a 100644
--- a/resources/views/livewire/project/shared/get-logs.blade.php
+++ b/resources/views/livewire/project/shared/get-logs.blade.php
@@ -215,15 +215,23 @@
                         </div>
                         <div class="logs-viewer-end runtime-logs-viewer-end">
                             <div class="logs-viewer-meta">
-                                <form x-on:submit.prevent="refresh()" class="logs-viewer-lines runtime-log-lines-group">
-                                    <span class="logs-viewer-lines-label">Lines</span>
-                                    <input type="number" wire:model="numberOfLines" placeholder="100" min="-1" max="50000"
+                                <form x-on:submit.prevent="refreshLines()" class="logs-viewer-lines runtime-log-lines-group">
+                                    <span class="logs-viewer-lines-label relative" :aria-busy="loadingLines">
+                                        <span :class="loadingLines ? 'invisible' : ''">Lines</span>
+                                        <x-loading compact x-cloak x-show="loadingLines" aria-label="Loading logs"
+                                            class="absolute inset-0 text-inherit!" />
+                                    </span>
+                                    <input type="number" wire:model="numberOfLines" x-on:input="allLines = Number($event.target.value) === -1" placeholder="100" min="-1" max="50000"
                                         title="Number of lines (max 50,000; use -1 for all)" {{ $streamLogs ? 'readonly' : '' }}
                                         class="input logs-viewer-lines-input" />
                                     <button type="button" x-on:click="showAllLogs()" title="Show all logs"
-                                        :class="$wire.numberOfLines == -1 ? 'runtime-log-lines-all-active' : ''"
-                                        :aria-pressed="$wire.numberOfLines == -1"
-                                        class="runtime-log-lines-all" {{ $streamLogs ? 'disabled' : '' }}>All</button>
+                                        :class="allLines ? 'runtime-log-lines-all-active' : ''"
+                                        :aria-pressed="allLines" :aria-busy="loadingAll"
+                                        class="runtime-log-lines-all relative" {{ $streamLogs ? 'disabled' : '' }}>
+                                        <span :class="loadingAll ? 'invisible' : ''">All</span>
+                                        <x-loading compact x-cloak x-show="loadingAll" aria-label="Loading all logs"
+                                            class="absolute inset-0 text-inherit!" />
+                                    </button>
                                 </form>
                             </div>
                             <div class="logs-viewer-search relative">