diff --git a/application/controllers/Satellite.php b/application/controllers/Satellite.php
index f17208b79..a7b8a6e35 100644
--- a/application/controllers/Satellite.php
+++ b/application/controllers/Satellite.php
@@ -248,6 +248,7 @@ class Satellite extends CI_Controller {
 
 		$footerData = [];
 		$footerData['scripts'] = [
+			'assets/js/bootstrap-multiselect.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/bootstrap-multiselect.js")),
 			'assets/js/sections/satpasses.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/satpasses.js")),
 		];
 
@@ -299,7 +300,7 @@ class Satellite extends CI_Controller {
 		$settings['maxazimuth']    	= $this->input->post('maxazimuth', true);
 		$settings['grid']          	= $this->input->post('grid', true);
 		$settings['sat']           	= $this->input->post('sat', true);
-		
+
 		$settings['sked_minelevation'] 	= $this->input->post('sked_minelevation', true) ?? '';
 		$settings['sked_minazimuth']   	= $this->input->post('sked_minazimuth', true) ?? '';
 		$settings['sked_maxazimuth']  	= $this->input->post('sked_maxazimuth', true) ?? '';
@@ -355,7 +356,7 @@ class Satellite extends CI_Controller {
 			foreach ($sat_pass_settings as $setting) {
 				$value = json_decode($setting->option_value);
 				$settings_id  = $setting->option_name;
-		
+
 				$r .= 	'<li>
 							<div class="dropdown-item d-flex justify-content-between align-items-center">
 								<button type="button" class="btn d-flex align-items-center" onclick="loadPassSettings(\''. $settings_id .'\')">
diff --git a/application/views/satellite/pass.php b/application/views/satellite/pass.php
index 7939c1e86..3f8909db9 100644
--- a/application/views/satellite/pass.php
+++ b/application/views/satellite/pass.php
@@ -8,6 +8,17 @@
 			<?php if ($satellites) { ?>
 
 			<h4><?= __("Your station"); ?></h4>
+			<div class="mb-3 w-auto d-flex flex-column">
+				<label for="satlist" class="my-1 me-sm-2 w-auto">
+					<?= __("Satellite"); ?>
+					<i class="fa fa-question-circle" aria-hidden="true" data-bs-toggle="tooltip" title="Only satellites with TLE data are shown here!"></i>
+				</label>
+				<select id="satlist" multiple class="my-1 me-sm-2 w-auto form-select form-select-sm">
+					<?php foreach($satellites as $sat): ?>
+						<option value="<?= $sat->satname; ?>"><?= $sat->satname; ?></option>
+					<?php endforeach; ?>
+				</select>
+			</div>
 			<div class="mb-3 w-auto">
 				<label class="my-1 me-sm-2 w-auto" id="label_minelevation" for="minelevation"><?= __("Min. Satellite Elevation"); ?></label>
 				<input class="my-1 me-sm-2 w-auto form-control form-control-sm" id="minelevation" type="number" min="0" max="90" name="minelevation" value="0" />
@@ -44,15 +55,6 @@
                         <?php endfor; ?>
 						</select>
 				</div>
-                <div class="mb-3 w-auto">
-					<label class="my-1 me-sm-2 w-auto" id="satslabel" for="satlist"><?= __("Satellite"); ?>   <i class="fa fa-question-circle" aria-hidden="true" data-bs-toggle="tooltip" title="Only satellites with TLE data are shown here!"></i></label>
-					<select class="my-1 me-sm-2 w-auto form-select form-select-sm"  multiple id="satlist">
-						<option value=""><?= __("All"); ?></option>
-						<?php foreach($satellites as $sat) {
-							echo '<option value="' . $sat->satname . '"' . '>' . $sat->satname . '</option>'."\n";
-						} ?>
-					</select>
-				</div>
 
 				<div id="addskedpartner" style="display:none" class="row">
 				<h4><?= __("Sked partner"); ?></h2>
diff --git a/assets/js/sections/satpasses.js b/assets/js/sections/satpasses.js
index be980c911..910be1629 100644
--- a/assets/js/sections/satpasses.js
+++ b/assets/js/sections/satpasses.js
@@ -1,6 +1,19 @@
 $(document).ready(function() {
     loadPassSettingsList();
-}); 
+
+	$('#satlist').multiselect({
+		// template is needed for bs5 support
+		enableFiltering: true,
+		enableCaseInsensitiveFiltering: true,
+		filterPlaceholder: lang_general_word_search,
+		templates: {
+		  button: '<button type="button" class="multiselect dropdown-toggle btn btn-sm btn-secondary me-2 w-auto" data-bs-toggle="dropdown" aria-expanded="false"><span class="multiselect-selected-text"></span></button>',
+		},
+		numberDisplayed: 1,
+		inheritClass: true,
+		includeSelectAllOption: true
+	});
+});
 
 function searchpasses() {
 	$(".ld-ext-right-plot").addClass('running');