diff --git a/src/bp-activity/admin/css/admin.css b/src/bp-activity/admin/css/admin.css
index 51d870eb2..3fd2d4233 100644
--- a/src/bp-activity/admin/css/admin.css
+++ b/src/bp-activity/admin/css/admin.css
@@ -102,6 +102,10 @@ ul.bp-activity-delete-list {
 	margin: 4px 26px;
 }
 
+#bp-activities-edit-form .stuffbox .inside {
+	padding: 0 10px;
+}
+
 @media screen and (max-width: 782px) {
 
 	body.toplevel_page_bp-activity .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column) {
diff --git a/src/bp-activity/bp-activity-admin.php b/src/bp-activity/bp-activity-admin.php
index d96725901..d1c47ad4d 100644
--- a/src/bp-activity/bp-activity-admin.php
+++ b/src/bp-activity/bp-activity-admin.php
@@ -775,7 +775,7 @@ function bp_activity_admin_edit() {
 					<div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
 						<div id="post-body-content">
 							<div id="postdiv">
-								<div id="bp_activity_action" class="postbox">
+								<div id="bp_activity_action" class="stuffbox">
 									<h2><?php _e( 'Action', 'buddypress' ); ?></h2>
 									<div class="inside">
 										<label for="bp-activities-action" class="screen-reader-text"><?php
@@ -786,7 +786,7 @@ function bp_activity_admin_edit() {
 									</div>
 								</div>
 
-								<div id="bp_activity_content" class="postbox">
+								<div id="bp_activity_content" class="stuffbox">
 									<h2><?php _e( 'Content', 'buddypress' ); ?></h2>
 									<div class="inside">
 										<label for="bp-activities-content" class="screen-reader-text"><?php
@@ -809,6 +809,8 @@ function bp_activity_admin_edit() {
 						</div>
 					</div><!-- #post-body -->
 
+					<br class="clear">
+
 				</div><!-- #poststuff -->
 				<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 				<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>