diff --git a/webpack/assets/javascripts/react_app/components/HostDetails/DetailsCard/index.js b/webpack/assets/javascripts/react_app/components/HostDetails/DetailsCard/index.js
index fc1288cd166..1212726115d 100644
--- a/webpack/assets/javascripts/react_app/components/HostDetails/DetailsCard/index.js
+++ b/webpack/assets/javascripts/react_app/components/HostDetails/DetailsCard/index.js
@@ -24,6 +24,7 @@ import { STATUS } from '../../../constants';
 import DefaultLoaderEmptyState from './DefaultLoaderEmptyState';
 import PowerStatusDropDown from './PowerStatus/PowerStatusDropDown';
 import { foremanUrl } from '../../../common/helpers';
+import { InlineEdit } from '../InlineEdit';
 
 import './styles.scss';
 
@@ -39,7 +40,10 @@ const DetailsCard = ({
     owner_name: ownerName,
     hostgroup_name: hostgroupName,
     hostgroup_id: hostgroupId,
-    permissions: { power_hosts: hasPowerPermission } = {},
+    permissions: {
+      power_hosts: hasPowerPermission,
+      edit_hosts: editPermission,
+    } = {},
   },
 }) => (
   <GridItem xl2={3} xl={4} md={6} lg={4} rowSpan={2}>
@@ -172,7 +176,12 @@ const DetailsCard = ({
                 emptyState={<DefaultLoaderEmptyState />}
                 status={status}
               >
-                {comment}
+                <InlineEdit
+                  name="comment"
+                  defaultValue={comment}
+                  hostName={hostName}
+                  editPermission={editPermission}
+                />
               </SkeletonLoader>
             </DescriptionListDescription>
           </DescriptionListGroup>
diff --git a/webpack/assets/javascripts/react_app/components/HostDetails/InlineEdit.js b/webpack/assets/javascripts/react_app/components/HostDetails/InlineEdit.js
new file mode 100644
index 00000000000..7eeff9e2ee9
--- /dev/null
+++ b/webpack/assets/javascripts/react_app/components/HostDetails/InlineEdit.js
@@ -0,0 +1,115 @@
+import React, { useState } from 'react';
+import { useDispatch } from 'react-redux';
+import PropTypes from 'prop-types';
+import { Button, TextInput, Flex, FlexItem } from '@patternfly/react-core';
+import { PencilAltIcon, CheckIcon, TimesIcon } from '@patternfly/react-icons';
+
+import { APIActions } from '../../redux/API';
+import { sprintf, translate as __ } from '../../common/I18n';
+
+export const InlineEdit = ({
+  name,
+  defaultValue,
+  hostName,
+  editPermission,
+}) => {
+  const [value, setValue] = useState(defaultValue);
+  const [isEditing, setIsEditing] = useState(false);
+
+  const handleInputChange = newValue => {
+    setValue(newValue);
+  };
+
+  const dispatch = useDispatch();
+  const handleSave = () => {
+    setIsEditing(false);
+
+    dispatch(
+      APIActions.put({
+        url: `/api/hosts/${hostName}`,
+        key: `${hostName}-${name}-EDIT`,
+        params: {
+          [name]: value,
+        },
+        successToast: () => sprintf(__('%s saved'), name),
+      })
+    );
+  };
+  const handleCancel = () => {
+    setIsEditing(false);
+    setValue(defaultValue);
+  };
+  return (
+    <Flex flexWrap={{ default: 'nowrap' }}>
+      {isEditing ? (
+        <>
+          <FlexItem
+            grow={{ default: 'grow' }}
+            spacer={{ default: 'spacerNone' }}
+          >
+            <TextInput
+              ouiaId={`input-${name}`}
+              value={value}
+              type="text"
+              onChange={handleInputChange}
+              aria-label="Editable text input"
+            />
+          </FlexItem>
+          <FlexItem spacer={{ default: 'spacerNone' }}>
+            <Button
+              variant="plain"
+              aria-label="Save edits"
+              ouiaId={`save-${name}`}
+              onClick={handleSave}
+            >
+              <CheckIcon />
+            </Button>
+          </FlexItem>
+          <FlexItem spacer={{ default: 'spacerNone' }}>
+            <Button
+              variant="plain"
+              aria-label="Cancel edits"
+              ouiaId={`cancel-edit-${name}`}
+              onClick={handleCancel}
+            >
+              <TimesIcon />
+            </Button>
+          </FlexItem>
+        </>
+      ) : (
+        <>
+          <FlexItem
+            spacer={{ default: 'spacerNone' }}
+            grow={{ default: 'grow' }}
+          >
+            <div className="pf-c-inline-edit__value">{value}</div>
+          </FlexItem>
+          {editPermission && (
+            <FlexItem spacer={{ default: 'spacerNone' }}>
+              <Button
+                ouiaId={`edit-${name}`}
+                variant="plain"
+                aria-label="Edit"
+                onClick={() => setIsEditing(true)}
+              >
+                <PencilAltIcon />
+              </Button>
+            </FlexItem>
+          )}
+        </>
+      )}
+    </Flex>
+  );
+};
+
+InlineEdit.propTypes = {
+  name: PropTypes.string.isRequired,
+  defaultValue: PropTypes.string,
+  hostName: PropTypes.string.isRequired,
+  editPermission: PropTypes.bool,
+};
+
+InlineEdit.defaultProps = {
+  defaultValue: '',
+  editPermission: false,
+};