diff --git a/src/ui/component/walletSendTip/view.jsx b/src/ui/component/walletSendTip/view.jsx
index ceb53242c..1aa2026f3 100644
--- a/src/ui/component/walletSendTip/view.jsx
+++ b/src/ui/component/walletSendTip/view.jsx
@@ -95,6 +95,7 @@ class WalletSendTip extends React.PureComponent<Props, State> {
                 label={__('Send')}
                 disabled={isPending || tipError || !tipAmount}
                 onClick={this.handleSendButtonClicked}
+                type="submit"
               />
             }
             helper={
diff --git a/src/ui/modal/modalConfirmTransaction/view.jsx b/src/ui/modal/modalConfirmTransaction/view.jsx
index f22203f4f..026acb0e0 100644
--- a/src/ui/modal/modalConfirmTransaction/view.jsx
+++ b/src/ui/modal/modalConfirmTransaction/view.jsx
@@ -1,5 +1,7 @@
 // @flow
 import React from 'react';
+import Button from 'component/button';
+import { Form } from 'component/common/form';
 import { Modal } from 'modal/modal';
 
 type Props = {
@@ -23,18 +25,22 @@ class ModalConfirmTransaction extends React.PureComponent<Props> {
         isOpen
         title={__('Send LBC')}
         contentLabel={__('Confirm Transaction')}
-        type="confirm"
-        confirmButtonLabel={__('Send')}
-        onConfirmed={() => this.onConfirmed()}
+        type="custom"
+        // confirmButtonLabel={__('Send')}
+        // onConfirmed={() => this.onConfirmed()}
         onAborted={closeModal}
       >
-        <section className="card__content">
+        <Form className="card__content" onSubmit={() => this.onConfirmed()}>
           <p>{__('Sending: ')}</p>
           <blockquote>{amount} LBC</blockquote>
           <p>{__('To address: ')}</p>
           <blockquote>{address}</blockquote>
           <p>{__('Once the transaction is sent, it cannot be reversed.')}</p>
-        </section>
+          <div className="card__actions">
+            <Button autoFocus button="primary" label={__('Send')} onClick={() => this.onConfirmed()} />
+            <Button button="link" label={__('Cancel')} onClick={closeModal} />
+          </div>
+        </Form>
       </Modal>
     );
   }
diff --git a/src/ui/modal/modalRemoveFile/view.jsx b/src/ui/modal/modalRemoveFile/view.jsx
index ffd3ab354..1a24d05c6 100644
--- a/src/ui/modal/modalRemoveFile/view.jsx
+++ b/src/ui/modal/modalRemoveFile/view.jsx
@@ -1,7 +1,8 @@
 // @flow
 import React from 'react';
 import { Modal } from 'modal/modal';
-import { FormField } from 'component/common/form';
+import { Form, FormField } from 'component/common/form';
+import Button from 'component/button';
 import usePersistedState from 'util/use-persisted-state';
 
 type Props = {
@@ -23,22 +24,13 @@ function ModalRemoveFile(props: Props) {
   const outpoint = fileInfo ? fileInfo.outpoint : `${txid}:${nout}`;
 
   return (
-    <Modal
-      isOpen
-      title="Remove File"
-      contentLabel={__('Confirm File Remove')}
-      type="confirm"
-      confirmButtonLabel={__('Remove')}
-      confirmButtonDisabled={!deleteChecked && !abandonChecked}
-      onConfirmed={() => deleteFile(outpoint || '', deleteChecked, abandonChecked)}
-      onAborted={closeModal}
-    >
+    <Modal isOpen title="Remove File" contentLabel={__('Confirm File Remove')} type="custom" onAborted={closeModal}>
       <section className="card__content">
         <p>
           {__("Are you sure you'd like to remove")} <cite>{`"${title}"`}</cite> {__('from the LBRY app?')}
         </p>
       </section>
-      <section className="card__content">
+      <Form className="card__content" onSubmit={() => deleteFile(outpoint || '', deleteChecked, abandonChecked)}>
         <FormField
           name="file_delete"
           label={__('Also delete this file from my computer')}
@@ -56,7 +48,17 @@ function ModalRemoveFile(props: Props) {
             onChange={() => setAbandonChecked(!abandonChecked)}
           />
         )}
-      </section>
+        <div className="card__actions">
+          <Button
+            autoFocus
+            button="primary"
+            label={__('OK')}
+            disabled={!deleteChecked && !abandonChecked}
+            onClick={() => deleteFile(outpoint || '', deleteChecked, abandonChecked)}
+          />
+          <Button button="link" label={__('Cancel')} onClick={closeModal} />
+        </div>
+      </Form>
     </Modal>
   );
 }