diff --git a/src/sentry/static/sentry/app/components/activity/note.jsx b/src/sentry/static/sentry/app/components/activity/note.jsx
index 9ddf5662f6072e..00e233bb170fc8 100644
--- a/src/sentry/static/sentry/app/components/activity/note.jsx
+++ b/src/sentry/static/sentry/app/components/activity/note.jsx
@@ -34,6 +34,7 @@ class Note extends React.Component {
               <a onClick={onEdit}>{t('Edit')}</a>
               <LinkWithConfirmation
                 className="danger"
+                title="Remove"
                 message={t('Are you sure you wish to delete this comment?')}
                 onConfirm={onDelete}
               >
diff --git a/src/sentry/static/sentry/app/components/activity/noteInput.jsx b/src/sentry/static/sentry/app/components/activity/noteInput.jsx
index 613754d93dd9ba..7bb72a9ae55d5e 100644
--- a/src/sentry/static/sentry/app/components/activity/noteInput.jsx
+++ b/src/sentry/static/sentry/app/components/activity/noteInput.jsx
@@ -252,7 +252,7 @@ const NoteInput = createReactClass({
     let btnText = updating ? t('Save Comment') : t('Post Comment');
 
     return (
-      <form className={classNames} onSubmit={this.onSubmit}>
+      <form noValidate className={classNames} onSubmit={this.onSubmit}>
         <div className="activity-notes">
           <ul className="nav nav-tabs">
             <li className={!preview ? 'active' : ''}>
diff --git a/src/sentry/static/sentry/app/views/groupActivity/index.jsx b/src/sentry/static/sentry/app/views/groupActivity/index.jsx
index 8c6a51ed9a9031..da28e9e4f3ca6b 100644
--- a/src/sentry/static/sentry/app/views/groupActivity/index.jsx
+++ b/src/sentry/static/sentry/app/views/groupActivity/index.jsx
@@ -230,7 +230,7 @@ const GroupActivity = createReactClass({
           <NoteContainer
             group={group}
             item={item}
-            key={itemIdx}
+            key={'note' + itemIdx}
             author={author}
             onDelete={this.onNoteDelete}
             sessionUser={me}
diff --git a/tests/js/spec/components/__snapshots__/noteInput.spec.jsx.snap b/tests/js/spec/components/__snapshots__/noteInput.spec.jsx.snap
index 6eb1f4e9243def..1f845b85f4a411 100644
--- a/tests/js/spec/components/__snapshots__/noteInput.spec.jsx.snap
+++ b/tests/js/spec/components/__snapshots__/noteInput.spec.jsx.snap
@@ -3,6 +3,7 @@
 exports[`NoteInput renders 1`] = `
 <form
   className="activity-field"
+  noValidate={true}
   onSubmit={[Function]}
 >
   <div