diff --git a/app/scripts/directives/editEnvironmentFrom.js b/app/scripts/directives/editEnvironmentFrom.js
index 709ca35835..73f3e2ac96 100644
--- a/app/scripts/directives/editEnvironmentFrom.js
+++ b/app/scripts/directives/editEnvironmentFrom.js
@@ -50,11 +50,12 @@
       ctrl.editEnvironmentFromForm.$setDirty();
     };
 
+    ctrl.isEnvFromSelectable = function() {
+      return !_.isEmpty(ctrl.envFromSelectorOptions);
+    };
+
     ctrl.isEnvFromReadonly = function(entry) {
-      return ctrl.isReadonlyAny ||
-        entry.isReadonlyValue === true ||
-        ((entry.secretRef || entry.configMapRef) && !entry.selectedEnvFrom) ||
-        _.isEmpty(ctrl.envFromSelectorOptions);
+      return ctrl.isReadonlyAny || entry.isReadonlyValue === true || ((entry.secretRef || entry.configMapRef) && !entry.selectedEnvFrom);
     };
 
     ctrl.groupByKind = function(object) {
diff --git a/app/views/directives/edit-environment-from.html b/app/views/directives/edit-environment-from.html
index 2b607be32b..61e3dca374 100644
--- a/app/views/directives/edit-environment-from.html
+++ b/app/views/directives/edit-environment-from.html
@@ -20,7 +20,7 @@
       <div class="form-group environment-from-input">
         <div ng-if="$ctrl.isEnvFromReadonly(entry)" class="faux-input-group">
           <div ng-if="!entry.configMapRef.name && !entry.secretRef.name">
-            No secrets or config maps have been added as Environment From.
+            No config maps or secrets have been added as Environment From.
           </div>
           <div ng-if="entry.configMapRef.name || entry.secretRef.name" class="faux-form-control readonly">
             Use all keys and values from
@@ -29,7 +29,7 @@
           </div>
         </div>
 
-        <div ng-if="!$ctrl.isEnvFromReadonly(entry)">
+        <div ng-if="$ctrl.isEnvFromSelectable() && !$ctrl.isEnvFromReadonly(entry)">
           <div class="ui-select">
             <ui-select ng-model="entry.selectedEnvFrom"
                        ng-required="entry.selectedEnvFrom"
@@ -52,7 +52,7 @@
         </div>
       </div>
 
-      <div ng-if="!$ctrl.isReadonlyAny && !entry.isReadonlyValue" class="environment-from-editor-button">
+      <div ng-if="$ctrl.isEnvFromSelectable() || !$ctrl.isEnvFromReadonly(entry)" class="environment-from-editor-button">
         <span
           ng-if="!$ctrl.cannotSort && $ctrl.entries.length > 1"
           class="fa fa-bars sort-row"
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index 504334387d..bbe6902da8 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -9147,8 +9147,10 @@ a.onAddRow = function() {
 s(a.envFromEntries), n.setFocusOn("." + a.setFocusClass);
 }, a.deleteEntry = function(e, t) {
 a.envFromEntries && !a.envFromEntries.length || (a.envFromEntries.splice(e, t), !a.envFromEntries.length && a.addRowLink && s(a.envFromEntries), a.updateEntries(a.envFromEntries), a.editEnvironmentFromForm.$setDirty());
+}, a.isEnvFromSelectable = function() {
+return !_.isEmpty(a.envFromSelectorOptions);
 }, a.isEnvFromReadonly = function(e) {
-return a.isReadonlyAny || !0 === e.isReadonlyValue || (e.secretRef || e.configMapRef) && !e.selectedEnvFrom || _.isEmpty(a.envFromSelectorOptions);
+return a.isReadonlyAny || !0 === e.isReadonlyValue || (e.secretRef || e.configMapRef) && !e.selectedEnvFrom;
 }, a.groupByKind = function(e) {
 return o(e.kind);
 }, a.dragControlListeners = {
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 5f9e2cef1e..ae043c6d6f 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -6613,7 +6613,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"form-group environment-from-input\">\n" +
     "<div ng-if=\"$ctrl.isEnvFromReadonly(entry)\" class=\"faux-input-group\">\n" +
     "<div ng-if=\"!entry.configMapRef.name && !entry.secretRef.name\">\n" +
-    "No secrets or config maps have been added as Environment From.\n" +
+    "No config maps or secrets have been added as Environment From.\n" +
     "</div>\n" +
     "<div ng-if=\"entry.configMapRef.name || entry.secretRef.name\" class=\"faux-form-control readonly\">\n" +
     "Use all keys and values from\n" +
@@ -6621,7 +6621,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span ng-if=\"entry.secretRef.name\">secret {{entry.secretRef.name}}</span>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<div ng-if=\"!$ctrl.isEnvFromReadonly(entry)\">\n" +
+    "<div ng-if=\"$ctrl.isEnvFromSelectable() && !$ctrl.isEnvFromReadonly(entry)\">\n" +
     "<div class=\"ui-select\">\n" +
     "<ui-select ng-model=\"entry.selectedEnvFrom\" ng-required=\"entry.selectedEnvFrom\" on-select=\"$ctrl.envFromObjectSelected($index, entry, $select.selected)\" ng-class=\"{'{{$ctrl.setFocusClass}}' : $last}\">\n" +
     "<ui-select-match placeholder=\"Select a resource\">\n" +
@@ -6637,7 +6637,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<div ng-if=\"!$ctrl.isReadonlyAny && !entry.isReadonlyValue\" class=\"environment-from-editor-button\">\n" +
+    "<div ng-if=\"$ctrl.isEnvFromSelectable() || !$ctrl.isEnvFromReadonly(entry)\" class=\"environment-from-editor-button\">\n" +
     "<span ng-if=\"!$ctrl.cannotSort && $ctrl.entries.length > 1\" class=\"fa fa-bars sort-row\" role=\"button\" aria-label=\"Move row\" aria-grabbed=\"false\" as-sortable-item-handle></span>\n" +
     "<a ng-if=\"!$ctrl.cannotDeleteAny\" href=\"\" class=\"pficon pficon-close delete-row as-sortable-item-delete\" role=\"button\" aria-label=\"Delete row\" ng-click=\"$ctrl.deleteEntry($index, 1)\"></a>\n" +
     "</div>\n" +