diff --git a/Moonlight/Features/Servers/UI/UserViews/Console.razor b/Moonlight/Features/Servers/UI/UserViews/Console.razor
index a28acb5..79544e3 100644
--- a/Moonlight/Features/Servers/UI/UserViews/Console.razor
+++ b/Moonlight/Features/Servers/UI/UserViews/Console.razor
@@ -18,7 +18,7 @@
             <Terminal @ref="Terminal"/>
             <div class="mt-3">
                 <div class="input-group">
-                    <input @bind="CommandInput" class="form-control form-control-transparent text-white" placeholder="Enter command"/>
+                    <input @bind="CommandInput" @bind:event="onchange" @onkeyup="OnEnterPressed" class="form-control form-control-transparent text-white" placeholder="Enter command"/>
                     <WButton CssClasses="btn btn-secondary rounded-start" Text="Execute" OnClick="SendCommand"/>
                 </div>
             </div>
@@ -118,6 +118,14 @@
 
         await InvokeAsync(StateHasChanged);
     }
+    
+    private async Task OnEnterPressed(KeyboardEventArgs args)
+    {
+        if(args.Code != "Enter" || args.CtrlKey || args.ShiftKey)
+            return;
+
+        await SendCommand();
+    }
 
     public void Dispose()
     {