diff --git a/resources/assets/scripts/components/server/components/database/CreateDatabaseModal.vue b/resources/assets/scripts/components/server/components/database/CreateDatabaseModal.vue
index 110726963..35cff9478 100644
--- a/resources/assets/scripts/components/server/components/database/CreateDatabaseModal.vue
+++ b/resources/assets/scripts/components/server/components/database/CreateDatabaseModal.vue
@@ -23,9 +23,14 @@
         <div class="text-right">
             <button class="btn btn-secondary btn-sm mr-2" v-on:click.once="$emit('close')">Cancel</button>
             <button class="btn btn-green btn-sm"
-                    :disabled="errors.any() || !canSubmit"
+                    :disabled="errors.any() || !canSubmit || showSpinner"
                     v-on:click="submit"
-            >Create</button>
+            >
+                <span class="spinner white" v-bind:class="{ hidden: !showSpinner }">&nbsp;</span>
+                <span :class="{ hidden: showSpinner }">
+                    Create
+                </span>
+            </button>
         </div>
     </div>
 </template>
@@ -40,6 +45,7 @@
         data: function () {
             return {
                 loading: false,
+                showSpinner: false,
                 database: '',
                 remote: '%',
                 errorMessage: '',
@@ -54,6 +60,7 @@
 
         methods: {
             submit: function () {
+                this.showSpinner = true;
                 this.errorMessage = '';
                 this.loading = true;
 
@@ -73,6 +80,7 @@
                     console.error('A network error was encountered while processing this request.', err.response);
                 }).then(() => {
                     this.loading = false;
+                    this.showSpinner = false;
                 })
             }
         }
diff --git a/resources/assets/scripts/components/server/subpages/Databases.vue b/resources/assets/scripts/components/server/subpages/Databases.vue
index c1ecef665..1425c77c0 100644
--- a/resources/assets/scripts/components/server/subpages/Databases.vue
+++ b/resources/assets/scripts/components/server/subpages/Databases.vue
@@ -4,7 +4,7 @@
             <div class="spinner spinner-xl blue"></div>
         </div>
         <div class="animate fadein" v-else>
-            <div class="context-box" v-if="!databases.length">
+            <div class="content-box mb-6" v-if="!databases.length">
                 <div class="flex items-center">
                     <database-icon class="flex-none text-grey-darker"></database-icon>
                     <div class="flex-1 px-4 text-grey-darker">
@@ -92,8 +92,6 @@
              * is closed with a successful callback.
              */
             handleModalCallback: function (object) {
-                console.log('handle', object);
-
                 const data = object;
                 data.password = data.relationships.password.attributes.password;
                 data.showPassword = false;