diff --git a/app/soapbox/components/icon_button.js b/app/soapbox/components/icon_button.js
index d7c036f12..aab5739d3 100644
--- a/app/soapbox/components/icon_button.js
+++ b/app/soapbox/components/icon_button.js
@@ -33,6 +33,7 @@ export default class IconButton extends React.PureComponent {
     tabIndex: PropTypes.string,
     text: PropTypes.string,
     emoji: PropTypes.string,
+    type: PropTypes.string,
   };
 
   static defaultProps = {
@@ -47,6 +48,7 @@ export default class IconButton extends React.PureComponent {
     onClick: () => {},
     onMouseEnter: () => {},
     onMouseLeave: () => {},
+    type: 'button',
   };
 
   handleClick = (e) =>  {
@@ -106,6 +108,7 @@ export default class IconButton extends React.PureComponent {
       title,
       text,
       emoji,
+      type,
     } = this.props;
 
     const classes = classNames(className, 'icon-button', {
@@ -134,6 +137,7 @@ export default class IconButton extends React.PureComponent {
           onMouseLeave={this.props.onMouseLeave}
           tabIndex={tabIndex}
           disabled={disabled}
+          type={type}
         >
           <div style={src ? {} : style}>
             {emoji
@@ -163,6 +167,7 @@ export default class IconButton extends React.PureComponent {
             onMouseLeave={this.props.onMouseLeave}
             tabIndex={tabIndex}
             disabled={disabled}
+            type={type}
           >
             <div style={src ? {} : style}>
               {emoji
diff --git a/app/soapbox/components/showable_password.js b/app/soapbox/components/showable_password.js
index a6dbdad24..ee5294afc 100644
--- a/app/soapbox/components/showable_password.js
+++ b/app/soapbox/components/showable_password.js
@@ -61,4 +61,4 @@ class ShowablePassword extends ImmutablePureComponent {
     );
   }
 
-}
\ No newline at end of file
+}
diff --git a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap
index 0588d8a02..67b68261f 100644
--- a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap
+++ b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap
@@ -50,6 +50,7 @@ exports[`<LoginForm /> renders for Mastodon 1`] = `
           onMouseLeave={[Function]}
           tabIndex="0"
           title="Show password"
+          type="button"
         >
           <div
             style={Object {}}
@@ -143,6 +144,7 @@ exports[`<LoginForm /> renders for Pleroma 1`] = `
           onMouseLeave={[Function]}
           tabIndex="0"
           title="Show password"
+          type="button"
         >
           <div
             style={Object {}}
diff --git a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap
index 0084bc159..23ea6c8f0 100644
--- a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap
+++ b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap
@@ -53,6 +53,7 @@ exports[`<LoginPage /> renders correctly on load 1`] = `
           onMouseLeave={[Function]}
           tabIndex="0"
           title="Show password"
+          type="button"
         >
           <div
             style={Object {}}