diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index a66bbf1d8..a4e66c87d 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -3603,7 +3603,7 @@ class e_form
 						$ttl = $expand."<button class='btn btn-default btn-xs btn-mini pull-right' {$dataAttr}>" . LAN_MORE . "</button>";
 					}
 					
-					$expands = '<a href="#'.$elid.'-expand" class="e-show-if-js e-expandit">'.defset($ttl, $ttl)."</a>";
+					$expands = '<a href="#'.$elid.'-expand" class="e-show-if-js e-expandit e-expandit-inline">'.defset($ttl, $ttl)."</a>";
 				}
 
 				$oldval = $value;
diff --git a/e107_web/js/core/all.jquery.js b/e107_web/js/core/all.jquery.js
index b770fa4f0..955304c62 100644
--- a/e107_web/js/core/all.jquery.js
+++ b/e107_web/js/core/all.jquery.js
@@ -234,7 +234,14 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
 					{
 						if($(this).is(':visible'))
 						{
-							$(this).css('display', 'block'); //XXX 'initial' broke the default behavior. 
+							if($this.hasClass('e-expandit-inline'))
+							{
+								$(this).css('display', 'initial');
+							}
+							else
+							{
+								$(this).css('display', 'block'); //XXX 'initial' broke the default behavior.
+							}
 						}
 					});