diff --git a/e107_plugins/pm/e_shortcode.php b/e107_plugins/pm/e_shortcode.php
index 33df6b708..109abc59a 100644
--- a/e107_plugins/pm/e_shortcode.php
+++ b/e107_plugins/pm/e_shortcode.php
@@ -62,7 +62,7 @@ class pm_shortcodes extends e_shortcode
 		$urlCompose = e107::url('pm','index','', array('query'=>array('mode'=>'send')));
 
 		return '<a class="nav-link dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown" href="#">'.$icon.$count.'</a>
-		<ul class="dropdown-menu">
+		<ul class="dropdown-menu dropdown-menu-end">
 		<li>
 			<a class="dropdown-item" href="'.$urlInbox.'">'.LAN_PLUGIN_PM_INBOX.'</a>
 			<a class="dropdown-item" href="'.$urlOutbox.'">'.LAN_PLUGIN_PM_OUTBOX.'</a>
diff --git a/e107_plugins/signin/templates/signin_template.php b/e107_plugins/signin/templates/signin_template.php
index bbe722879..2655c4708 100644
--- a/e107_plugins/signin/templates/signin_template.php
+++ b/e107_plugins/signin/templates/signin_template.php
@@ -51,7 +51,7 @@ $SIGNIN_TEMPLATE['signout'] = '
 		<ul class="navbar-nav navbar-right">
 			{SIGNIN_PM_NAV}
 			<li class="dropdown dropdown-avatar"><a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" data-toggle="dropdown">{USER_AVATAR: w=30&h=30&crop=1&shape=circle} {SIGNIN_USERNAME} <b class="caret"></b></a>
-				<ul class="dropdown-menu  ">
+				<ul class="dropdown-menu dropdown-menu-end">
 				<li>
 					<a class="dropdown-item" href="{SIGNIN_USERSETTINGS_HREF}"><span class="fa fa-cog"></span> {LAN=LAN_SETTINGS}</a>
 				</li>