diff --git a/public/src/client/topic/fork.js b/public/src/client/topic/fork.js
index a3667c8ece..b420acc5c7 100644
--- a/public/src/client/topic/fork.js
+++ b/public/src/client/topic/fork.js
@@ -29,7 +29,10 @@ define('forum/topic/fork', [
 
 			$('body').append(forkModal);
 
-			categorySelector.init(forkModal.find('[component="category-selector"]'), {
+			const dropdownEl = forkModal.find('[component="category-selector"]');
+			dropdownEl.addClass('dropup');
+
+			categorySelector.init(dropdownEl, {
 				onSelect: function (category) {
 					selectedCategory = category;
 				},
diff --git a/public/src/client/topic/move.js b/public/src/client/topic/move.js
index dd9ca76fca..ba4f055e68 100644
--- a/public/src/client/topic/move.js
+++ b/public/src/client/topic/move.js
@@ -28,8 +28,10 @@ define('forum/topic/move', [
 			if (Move.moveAll || (Move.tids && Move.tids.length > 1)) {
 				modal.find('.card-header').translateText('[[topic:move-topics]]');
 			}
+			const dropdownEl = modal.find('[component="category-selector"]');
+			dropdownEl.addClass('dropup');
 
-			categorySelector.init(modal.find('[component="category-selector"]'), {
+			categorySelector.init(dropdownEl, {
 				onSelect: onCategorySelected,
 				privilege: 'moderate',
 			});
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index fb80f94b0f..0a3346e6dc 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -39,7 +39,7 @@
 				</div>
 				<div class="btn-group">
 					<button class="btn btn-primary btn-sm dropdown-toggle" id="action-dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" type="button" disabled="disabled">[[admin/manage/users:edit]] <span class="caret"></span></button>
-					<ul class="dropdown-menu dropdown-menu-end p-1 text-sm" role="menu">
+					<ul class="dropdown-menu dropdown-menu-end p-1 text-sm overflow-auto" role="menu" style="max-height:75vh;">
 
 						<li><h6 class="dropdown-header">[[admin/manage/users:email]]</h6></li>
 						<li><a href="#" class="dropdown-item rounded-1 change-email" role="menuitem"><i class="text-secondary fa fa-fw fa-envelope text-start"></i> [[admin/manage/users:change-email]]</a></li>