diff --git a/src/renderer/component/shapeShift/internal/active-shift.jsx b/src/renderer/component/shapeShift/internal/active-shift.jsx
index 0c07b808b..7d2af51c9 100644
--- a/src/renderer/component/shapeShift/internal/active-shift.jsx
+++ b/src/renderer/component/shapeShift/internal/active-shift.jsx
@@ -131,16 +131,14 @@ class ActiveShapeShift extends React.PureComponent<Props> {
               href={`https://shapeshift.io/#/status/${shiftOrderId}`}
             />
           )}
-          {shiftState === statuses.NO_DEPOSITS &&
-            shiftReturnAddress && (
-              <div className="shapeshift__actions-help">
-                <span className="help">
-                  If the transaction doesn't go through, ShapeShift will return your {shiftCoinType}{' '}
-                  back to {shiftReturnAddress}
-                </span>
-              </div>
-            )}
         </div>
+        {shiftState === statuses.NO_DEPOSITS &&
+          shiftReturnAddress && (
+            <div className="help">
+              If the transaction doesn't go through, ShapeShift will return your {shiftCoinType}{' '}
+              back to {shiftReturnAddress}
+            </div>
+          )}
       </div>
     );
   }
diff --git a/src/renderer/component/walletAddress/view.jsx b/src/renderer/component/walletAddress/view.jsx
index 1cfc6dd39..50f43dd34 100644
--- a/src/renderer/component/walletAddress/view.jsx
+++ b/src/renderer/component/walletAddress/view.jsx
@@ -66,9 +66,11 @@ class WalletAddress extends React.PureComponent<Props> {
           />
         </div>
 
-        <div className="card__content">
-          {showQR && <QRCode value={receiveAddress} paddingTop />}
-        </div>
+        {showQR && (
+          <div className="card__content">
+            <QRCode value={receiveAddress} paddingTop />
+          </div>
+        )}
 
         <div className="card__content">
           <div className="help">