diff --git a/app/Http/Livewire/RunCommand.php b/app/Http/Livewire/RunCommand.php
index e5404a485..50462c52c 100755
--- a/app/Http/Livewire/RunCommand.php
+++ b/app/Http/Livewire/RunCommand.php
@@ -28,8 +28,8 @@ public function mount($servers)
 
     public function runCommand()
     {
+        $this->validate();
         try {
-            $this->validate();
             $activity = remote_process([$this->command], Server::where('uuid', $this->server)->first(), ignore_errors: true);
             $this->emit('newMonitorActivity', $activity->id);
         } catch (\Exception $e) {
diff --git a/resources/views/livewire/run-command.blade.php b/resources/views/livewire/run-command.blade.php
index d9bc3a9d9..f05b58a93 100644
--- a/resources/views/livewire/run-command.blade.php
+++ b/resources/views/livewire/run-command.blade.php
@@ -1,5 +1,5 @@
 <div>
-    <form class="flex items-end justify-center gap-2" wire:submit.prevent='runCommand'>
+    <form class="flex flex-col justify-center gap-2 xl:items-end xl:flex-row" wire:submit.prevent='runCommand'>
         <x-forms.input placeholder="ls -l" autofocus noDirty id="command" label="Command" required />
         <x-forms.select label="Server" id="server" required>
             @foreach ($servers as $server)