diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html
index 33e71c3ed..4551597ee 100644
--- a/pages/_includes/cards/invoices.html
+++ b/pages/_includes/cards/invoices.html
@@ -63,8 +63,8 @@
 				<td class="text-right">
 					<button class="btn btn-secondary btn-sm align-text-top">Manage</button>
 					<span class="dropdown ml-1">
-						<button class="btn btn-secondary btn-sm dropdown-toggle align-text-top" data-toggle="dropdown">Actions</button>
-						{% include ui/dropdown-menu.html %}
+						<button class="btn btn-secondary btn-sm dropdown-toggle align-text-top" data-boundary="viewport" data-toggle="dropdown">Actions</button>
+						{% include ui/dropdown-menu.html right=true %}
 					</span>
 				</td>
 				<td>
diff --git a/pages/_includes/cards/table-users.html b/pages/_includes/cards/table-users.html
index 266c1acae..5a3f9d918 100644
--- a/pages/_includes/cards/table-users.html
+++ b/pages/_includes/cards/table-users.html
@@ -61,10 +61,10 @@
 				</td>
 				<td class="text-center">
 					<div class="dropdown">
-						<a class="btn-icon mx-2" data-toggle="dropdown">
+						<a class="btn-icon mx-2" data-boundary="viewport" data-toggle="dropdown">
 							{% include ui/icon.html icon="more-vertical" %}
 						</a>
-						{% include ui/dropdown-menu.html %}
+						{% include ui/dropdown-menu.html right=true %}
 					</div>
 				</td>
 			</tr>