diff --git a/docs/guides/actions.rst b/docs/guides/actions.rst
index 8d1a3fecf90..1e0a4e882dd 100644
--- a/docs/guides/actions.rst
+++ b/docs/guides/actions.rst
@@ -293,10 +293,12 @@ The above will generate the following markup:
 
    <div class="elgg-field elgg-field-required">
       <label for="elgg-field-1" class="elgg-field-label">Blog status<span title="Required" class="elgg-required-indicator">*</span></label>
-      <select required="required" name="status" data-rel="blog" id="elgg-field-1" class="elgg-input-dropdown">
-         <option value="draft">Draft</option>
-         <option value="published">Published</option>
-      </select>
+      <div class="elgg-field-input">
+      	 <select required="required" name="status" data-rel="blog" id="elgg-field-1" class="elgg-input-dropdown">
+            <option value="draft">Draft</option>
+            <option value="published">Published</option>
+         </select>
+      </div>
       <div class="elgg-field-help elgg-text-help">
          <span class="elgg-icon-help elgg-icon"></span>This indicates whether or not the blog is visible in the feed
       </div>
diff --git a/views/default/elements/forms/input.php b/views/default/elements/forms/input.php
index 82ade179e42..3c8984db644 100644
--- a/views/default/elements/forms/input.php
+++ b/views/default/elements/forms/input.php
@@ -6,4 +6,8 @@
 $input_type = elgg_extract('input_type', $vars);
 unset($vars['input_type']);
 
-echo elgg_view("input/$input_type", $vars);
+$input = elgg_view("input/$input_type", $vars);
+
+echo elgg_format_element('div', [
+	'class' => 'elgg-field-input',
+], $input);
diff --git a/views/default/elements/navigation.css.php b/views/default/elements/navigation.css.php
index 23ef7db699f..23efaca7ce5 100644
--- a/views/default/elements/navigation.css.php
+++ b/views/default/elements/navigation.css.php
@@ -536,7 +536,7 @@
 .elgg-menu-longtext {
 	float: right;
 }
-.elgg-field-label + .elgg-menu-longtext {
+.elgg-field-input > .elgg-menu-longtext {
 	margin-top: -20px;
 }
 /* ***************************************
diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php
index fe515462122..210827f0926 100644
--- a/views/default/forms/profile/edit.php
+++ b/views/default/forms/profile/edit.php
@@ -66,9 +66,11 @@
 			'name' => "accesslevel[$shortname]",
 			'value' => $access_id,
 		]);
-
+		
 		echo elgg_view('elements/forms/field', [
-			'input' => $input . $access_input,
+			'input' => elgg_format_element('div', [
+					'class' => 'elgg-field-input',
+				], $input . $access_input),
 			'label' => elgg_view('elements/forms/label', [
 				'label' => elgg_echo("profile:$shortname"),
 				'id' => $id,