diff --git a/app/scripts/directives/editEnvironmentFrom.js b/app/scripts/directives/editEnvironmentFrom.js
index cf7ac256a7..36e5535f8a 100644
--- a/app/scripts/directives/editEnvironmentFrom.js
+++ b/app/scripts/directives/editEnvironmentFrom.js
@@ -41,6 +41,7 @@
     };
 
     ctrl.closeOverlayPanel = function() {
+      ctrl.showSecret = false;
       ctrl.overlayPanelVisible = false;
     };
 
diff --git a/app/views/directives/edit-environment-from.html b/app/views/directives/edit-environment-from.html
index 9bf9ea2fe6..7ef4e64a88 100644
--- a/app/views/directives/edit-environment-from.html
+++ b/app/views/directives/edit-environment-from.html
@@ -89,7 +89,11 @@ <h3>{{$ctrl.overlayPaneEntryDetails.kind | humanizeKind : true}} Details</h3>
     </div>
     <div class="modal-body">
       <h4>{{$ctrl.overlayPaneEntryDetails.metadata.name}}
-        <small ng-if="$ctrl.overlayPaneEntryDetails.kind === 'Secret'" class="mar-left-sm"><a href="" ng-click="$ctrl.showSecret = !$ctrl.showSecret">{{$ctrl.showSecret ? "Hide" : "Reveal"}} Values</a></small>
+        <small ng-if="$ctrl.overlayPaneEntryDetails.kind === 'Secret'" class="mar-left-sm">
+          <a href=""
+             role="button"
+             ng-click="$ctrl.showSecret = !$ctrl.showSecret">{{$ctrl.showSecret ? "Hide" : "Reveal"}} Secret</a>
+        </small>
       </h4>
 
       <div ng-if="!($ctrl.overlayPaneEntryDetails.data | size)" class="empty-state-message text-center">
@@ -112,7 +116,12 @@ <h4>{{$ctrl.overlayPaneEntryDetails.metadata.name}}
 
                 <span ng-if="!$ctrl.showSecret && $ctrl.overlayPaneEntryDetails.kind === 'Secret'">&#42;&#42;&#42;&#42;&#42;</span>
                 <div ng-if="$ctrl.showSecret && $ctrl.overlayPaneEntryDetails.kind === 'Secret'">
-                  {{value}}
+                  <truncate-long-text
+                    content="value"
+                    limit="50"
+                    newline-limit="2"
+                    expandable="true">
+                  </truncate-long-text>
                   <div ng-if="decodedData.$$nonprintable[prop]" class="help-block">
                     This secret value contains non-printable characters and is displayed as a Base64-encoded string.
                   </div>
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index f368550162..5b9f4e21d6 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -9217,7 +9217,7 @@ var r = this, o = t("canI"), i = t("humanizeKind"), s = _.uniqueId();
 r.setFocusClass = "edit-environment-from-set-focus-" + s, r.viewOverlayPanel = function(e) {
 r.decodedData = e.data, r.overlayPaneEntryDetails = e, "Secret" === e.kind && (r.decodedData = a.decodeSecretData(e.data)), r.overlayPanelVisible = !0;
 }, r.closeOverlayPanel = function() {
-r.overlayPanelVisible = !1;
+r.showSecret = !1, r.overlayPanelVisible = !1;
 };
 var c = function(e, t) {
 e && e.push(t || {});
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 2108eeb3bc..3976ba8c2f 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -6749,7 +6749,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"modal-body\">\n" +
     "<h4>{{$ctrl.overlayPaneEntryDetails.metadata.name}}\n" +
-    "<small ng-if=\"$ctrl.overlayPaneEntryDetails.kind === 'Secret'\" class=\"mar-left-sm\"><a href=\"\" ng-click=\"$ctrl.showSecret = !$ctrl.showSecret\">{{$ctrl.showSecret ? \"Hide\" : \"Reveal\"}} Values</a></small>\n" +
+    "<small ng-if=\"$ctrl.overlayPaneEntryDetails.kind === 'Secret'\" class=\"mar-left-sm\">\n" +
+    "<a href=\"\" role=\"button\" ng-click=\"$ctrl.showSecret = !$ctrl.showSecret\">{{$ctrl.showSecret ? \"Hide\" : \"Reveal\"}} Secret</a>\n" +
+    "</small>\n" +
     "</h4>\n" +
     "<div ng-if=\"!($ctrl.overlayPaneEntryDetails.data | size)\" class=\"empty-state-message text-center\">\n" +
     "The {{$ctrl.overlayPaneEntryDetails.kind | humanizeKind}} has no properties.\n" +
@@ -6764,7 +6766,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</truncate-long-text>\n" +
     "<span ng-if=\"!$ctrl.showSecret && $ctrl.overlayPaneEntryDetails.kind === 'Secret'\">&#42;&#42;&#42;&#42;&#42;</span>\n" +
     "<div ng-if=\"$ctrl.showSecret && $ctrl.overlayPaneEntryDetails.kind === 'Secret'\">\n" +
-    "{{value}}\n" +
+    "<truncate-long-text content=\"value\" limit=\"50\" newline-limit=\"2\" expandable=\"true\">\n" +
+    "</truncate-long-text>\n" +
     "<div ng-if=\"decodedData.$$nonprintable[prop]\" class=\"help-block\">\n" +
     "This secret value contains non-printable characters and is displayed as a Base64-encoded string.\n" +
     "</div>\n" +