diff --git a/awx/ui/client/src/inventories-hosts/hosts/host.form.js b/awx/ui/client/src/inventories-hosts/hosts/host.form.js
index d64145be5d..52c6f0d8c1 100644
--- a/awx/ui/client/src/inventories-hosts/hosts/host.form.js
+++ b/awx/ui/client/src/inventories-hosts/hosts/host.form.js
@@ -22,6 +22,7 @@ function(i18n) {
             formLabelSize: 'col-lg-3',
             formFieldSize: 'col-lg-9',
             iterator: 'host',
+            detailsClick: "$state.go('hosts.edit', null, {reload:true})",
             activeEditState: 'hosts.edit',
             stateTree: 'hosts',
             headerFields:{
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.form.js
index a8a1e89499..1f11a8fc28 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.form.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.form.js
@@ -22,6 +22,7 @@ function(i18n) {
             formLabelSize: 'col-lg-3',
             formFieldSize: 'col-lg-9',
             iterator: 'host',
+            detailsClick: "$state.go('inventories.edit.hosts.edit', null, {reload:true})",
             stateTree: 'inventories.edit.hosts',
             headerFields:{
                 enabled: {
diff --git a/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.controller.js b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.controller.js
index 0fea8b1772..9b8b5bb509 100644
--- a/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.controller.js
+++ b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.controller.js
@@ -8,15 +8,16 @@ function AnsibleFacts($scope, Facts, ParseTypeChange, ParseVariableString) {
 
     function init() {
         $scope.facts = ParseVariableString(Facts.data);
-
+        let rows = (_.isEmpty(Facts.data)) ? 6 : 20;
+        $("#host_facts").attr("rows", rows);
         $scope.parseType = 'yaml';
         ParseTypeChange({
-            scope: $scope,
-            variable: 'facts',
-            parse_variable: 'parseType',
-            field_id: 'host_facts',
-            readOnly: true
-        });
+             scope: $scope,
+             variable: 'facts',
+             parse_variable: 'parseType',
+             field_id: 'host_facts',
+             readOnly: true
+         });
     }
 
     init();
diff --git a/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.partial.html b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.partial.html
index ae36d39393..5cb0ac2162 100644
--- a/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.partial.html
+++ b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.partial.html
@@ -4,7 +4,7 @@
 		          <span class="Form-inputLabel" translate>FACTS</span>
          </label>
          <div>
-             <textarea rows="10" ng-model="facts" name="facts" class="form-control Form-textArea Form-formGroup--fullWidth" id="host_facts"></textarea>
+             <textarea rows="6"  ng-model="facts" name="facts" class="form-control Form-textArea Form-formGroup--fullWidth" id="host_facts"></textarea>
          </div>
      </div>
 </form>