diff --git a/app/Livewire/Project/Shared/ExecuteContainerCommand.php b/app/Livewire/Project/Shared/ExecuteContainerCommand.php
index 2d55807c7..6833492a6 100644
--- a/app/Livewire/Project/Shared/ExecuteContainerCommand.php
+++ b/app/Livewire/Project/Shared/ExecuteContainerCommand.php
@@ -132,6 +132,12 @@ class ExecuteContainerCommand extends Component
                 });
             }
         }
+
+        // Sort containers alphabetically by name
+        $this->containers = $this->containers->sortBy(function ($container) {
+            return data_get($container, 'container.Names');
+        });
+
         if ($this->containers->count() === 1) {
             $this->selected_container = data_get($this->containers->first(), 'container.Names');
         }
diff --git a/app/Livewire/Terminal/Index.php b/app/Livewire/Terminal/Index.php
index 10084a991..f4008cb1c 100644
--- a/app/Livewire/Terminal/Index.php
+++ b/app/Livewire/Terminal/Index.php
@@ -59,7 +59,7 @@ class Index extends Component
 
                 return null;
             })->filter();
-        });
+        })->sortBy('name');
     }
 
     public function updatedSelectedUuid()