diff --git a/.travis.yml b/.travis.yml
index 17e65571b4b..3aeafe94aab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: required
 language: node_js
 node_js:
 - 6.3.1
diff --git a/src/internal-packages/database/lib/components/create-collection-dialog.jsx b/src/internal-packages/database/lib/components/create-collection-dialog.jsx
index 11a1dd0e520..a25fe793a8c 100644
--- a/src/internal-packages/database/lib/components/create-collection-dialog.jsx
+++ b/src/internal-packages/database/lib/components/create-collection-dialog.jsx
@@ -73,8 +73,12 @@ class CreateCollectionDialog extends React.Component {
 
   /**
    * Initiate the attempt to create a collection.
+   * @param {Object} evt - The event object
    */
-  onCreateCollectionButtonClicked() {
+  onCreateCollectionButtonClicked(evt) {
+    evt.preventDefault();
+    evt.stopPropagation();
+
     this.setState({ inProgress: true, error: false, errorMessage: '' });
     Actions.createCollection(
       this.state.databaseName,
@@ -163,7 +167,9 @@ class CreateCollectionDialog extends React.Component {
         </Modal.Header>
 
         <Modal.Body>
-          <form name="create-collection-dialog-form">
+          <form name="create-collection-dialog-form"
+            onSubmit={this.onCreateCollectionButtonClicked.bind(this)}
+          >
             <CreateCollectionInput
               name="Collection Name"
               value={this.state.collectionName}
diff --git a/src/internal-packages/database/lib/components/drop-collection-dialog.jsx b/src/internal-packages/database/lib/components/drop-collection-dialog.jsx
index 3c1a1faf34d..3174f157bdd 100644
--- a/src/internal-packages/database/lib/components/drop-collection-dialog.jsx
+++ b/src/internal-packages/database/lib/components/drop-collection-dialog.jsx
@@ -62,8 +62,17 @@ class DropCollectionDialog extends React.Component {
 
   /**
    * Initiate the attempt to drop a database.
+   * @param {Object} evt - The event object
    */
-  onDropCollectionButtonClicked() {
+  onDropCollectionButtonClicked(evt) {
+    evt.preventDefault();
+    evt.stopPropagation();
+
+    // prevent drop of collection if names don't match
+    if (this.state.confirmName !== this.state.name) {
+      return;
+    }
+
     this.setState({ inProgress: true, error: false, errorMessage: '' });
     Actions.dropCollection(this.state.databaseName, this.state.name);
   }
@@ -111,7 +120,9 @@ class DropCollectionDialog extends React.Component {
               to drop
             </p>
           </div>
-          <form>
+          <form
+            onSubmit={this.onDropCollectionButtonClicked.bind(this)}
+          >
             <div className="form-group">
               <input
                 type="text"
diff --git a/src/internal-packages/server-stats/lib/component/create-database-dialog.jsx b/src/internal-packages/server-stats/lib/component/create-database-dialog.jsx
index 2304ab0b9b3..947f5ed59d7 100644
--- a/src/internal-packages/server-stats/lib/component/create-database-dialog.jsx
+++ b/src/internal-packages/server-stats/lib/component/create-database-dialog.jsx
@@ -76,8 +76,11 @@ class CreateDatabaseDialog extends React.Component {
 
   /**
    * Initiate the attempt to create a database.
+   * @param {Object} evt - The event object
    */
-  onCreateDatabaseButtonClicked() {
+  onCreateDatabaseButtonClicked(evt) {
+    evt.preventDefault();
+    evt.stopPropagation();
     this.setState({ inProgress: true, error: false, errorMessage: '' });
     Actions.createDatabase(
       this.state.databaseName,
@@ -186,7 +189,10 @@ class CreateDatabaseDialog extends React.Component {
         </Modal.Header>
 
         <Modal.Body>
-          <form name="create-collection-dialog-form">
+          <form
+            name="create-collection-dialog-form"
+            onSubmit={this.onCreateDatabaseButtonClicked.bind(this)}
+          >
             <this.CreateCollectionInput
               name="Database Name"
               value={this.state.databaseName}
diff --git a/src/internal-packages/server-stats/lib/component/drop-database-dialog.jsx b/src/internal-packages/server-stats/lib/component/drop-database-dialog.jsx
index 395f514fb5a..414c2b9c919 100644
--- a/src/internal-packages/server-stats/lib/component/drop-database-dialog.jsx
+++ b/src/internal-packages/server-stats/lib/component/drop-database-dialog.jsx
@@ -55,8 +55,16 @@ class DropDatabaseDialog extends React.Component {
 
   /**
    * Initiate the attempt to drop a database.
+   * @param {Object} evt - The event object
    */
-  onDropDatabaseButtonClicked() {
+  onDropDatabaseButtonClicked(evt) {
+    evt.preventDefault();
+    evt.stopPropagation();
+
+    // prevent drop database if names don't match
+    if (this.state.confirmName !== this.state.name) {
+      return;
+    }
     this.setState({ inProgress: true, error: false, errorMessage: '' });
     Actions.dropDatabase(this.state.name);
   }
@@ -104,7 +112,9 @@ class DropDatabaseDialog extends React.Component {
               to drop
             </p>
           </div>
-          <form>
+          <form
+            onSubmit={this.onDropDatabaseButtonClicked.bind(this)}
+          >
             <div className="form-group">
               <input
                 type="text"