diff --git a/administrator/components/com_modules/forms/module.xml b/administrator/components/com_modules/forms/module.xml
index ca92bd2c76782..3166ca932fc88 100644
--- a/administrator/components/com_modules/forms/module.xml
+++ b/administrator/components/com_modules/forms/module.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
+	<config>         
+		<inlinehelp button="show"/>     
+	</config>
 	<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
 		<field
 			name="id"
diff --git a/administrator/components/com_modules/forms/moduleadmin.xml b/administrator/components/com_modules/forms/moduleadmin.xml
index 4f2b7efa84e93..4ab9d09023d15 100644
--- a/administrator/components/com_modules/forms/moduleadmin.xml
+++ b/administrator/components/com_modules/forms/moduleadmin.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
+	<config>         
+		<inlinehelp button="show"/>     
+	</config>
 	<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
 		<field
 			name="id"
diff --git a/administrator/components/com_modules/src/View/Module/HtmlView.php b/administrator/components/com_modules/src/View/Module/HtmlView.php
index 0fa6388aacf7b..98b3f402b6e27 100644
--- a/administrator/components/com_modules/src/View/Module/HtmlView.php
+++ b/administrator/components/com_modules/src/View/Module/HtmlView.php
@@ -164,6 +164,7 @@ protected function addToolbar()
 			$url = null;
 		}
 
+		ToolbarHelper::inlinehelp();
 		ToolbarHelper::help($help->key, false, $url);
 	}
 }
diff --git a/administrator/components/com_plugins/forms/plugin.xml b/administrator/components/com_plugins/forms/plugin.xml
index 37a70c983ca3b..f85c48b9c30a3 100644
--- a/administrator/components/com_plugins/forms/plugin.xml
+++ b/administrator/components/com_plugins/forms/plugin.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form addfieldprefix="Joomla\Component\Plugins\Administrator\Field">
+	<config>         
+		<inlinehelp button="show"/>     
+	</config>
 	<fieldset>
 		<field
 			name="extension_id"
diff --git a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
index 019454e1ce133..888a2303002ab 100644
--- a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
+++ b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
@@ -112,6 +112,7 @@ protected function addToolbar()
 			$url = null;
 		}
 
+		ToolbarHelper::inlinehelp();
 		ToolbarHelper::help($help->key, false, $url);
 	}
 }
diff --git a/build/media_source/system/js/inlinehelp.es6.js b/build/media_source/system/js/inlinehelp.es6.js
index 7ce26f6f1f8b0..6236b9581f02c 100644
--- a/build/media_source/system/js/inlinehelp.es6.js
+++ b/build/media_source/system/js/inlinehelp.es6.js
@@ -41,6 +41,14 @@ Joomla.toggleInlineHelp = (toggleClass) => {
   .forEach((elToggler) => {
     // The class of the DIVs to toggle visibility on is defined by the data-class attribute of the click target.
     const toggleClass = elToggler.dataset.class ?? 'hide-aware-inline-help';
+    const collection = document.getElementsByClassName(toggleClass);
+
+    // no description => hide inlinehelp button
+    if (collection.length === 0) {
+      elToggler.classList.add('d-none');
+      return;
+    }
+
     // Add the click handler.
     elToggler.addEventListener('click', (event) => {
       event.preventDefault();