diff --git a/packages/api-generator/src/helpers/default-slots.js b/packages/api-generator/src/helpers/default-slots.js
index 1eea5aff0a5..b66ee0b510a 100644
--- a/packages/api-generator/src/helpers/default-slots.js
+++ b/packages/api-generator/src/helpers/default-slots.js
@@ -61,6 +61,7 @@ module.exports = [
   'v-stepper-items',
   'v-stepper-step',
   'v-stepper',
+  'v-stepper-content',
   'v-subheader',
   'v-tab-item',
   'v-tab',
diff --git a/packages/api-generator/src/maps/v-stepper.js b/packages/api-generator/src/maps/v-stepper.js
index 789d591fc5e..60adb5629e7 100644
--- a/packages/api-generator/src/maps/v-stepper.js
+++ b/packages/api-generator/src/maps/v-stepper.js
@@ -1,10 +1,18 @@
-module.exports = {
-  'v-stepper': {
-    events: [
-      {
-        name: 'input',
-        value: 'number',
-      },
-    ],
-  },
-}
+module.exports = {
+  'v-stepper': {
+    events: [
+      {
+        name: 'input',
+        value: 'number',
+      },
+    ],
+  },
+  'v-stepper-step': {
+    events: [
+      {
+        name: 'click',
+        value: 'MouseEvent',
+      },
+    ],
+  },
+}
diff --git a/packages/docs/src/lang/en/components/Steppers.json b/packages/docs/src/lang/en/components/Steppers.json
index aaa14fcb83d..36d1a74b787 100644
--- a/packages/docs/src/lang/en/components/Steppers.json
+++ b/packages/docs/src/lang/en/components/Steppers.json
@@ -71,5 +71,10 @@
     "v-stepper-content": {
       "step": "Sets step to associate the content to"
     }
+  },
+  "events": {
+    "v-stepper-step": {
+      "click": "Emitted when component is clicked"
+    }
   }
 }
diff --git a/packages/vuetify/src/components/VStepper/VStepper.ts b/packages/vuetify/src/components/VStepper/VStepper.ts
index 069f2cd26e4..2eed0211e79 100644
--- a/packages/vuetify/src/components/VStepper/VStepper.ts
+++ b/packages/vuetify/src/components/VStepper/VStepper.ts
@@ -38,8 +38,8 @@ export default baseMixins.extend({
   },
 
   props: {
-    nonLinear: Boolean,
     altLabels: Boolean,
+    nonLinear: Boolean,
     vertical: Boolean,
   },
 
diff --git a/packages/vuetify/src/components/VStepper/VStepperStep.ts b/packages/vuetify/src/components/VStepper/VStepperStep.ts
index 48ceec74658..a4cf6655109 100644
--- a/packages/vuetify/src/components/VStepper/VStepperStep.ts
+++ b/packages/vuetify/src/components/VStepper/VStepperStep.ts
@@ -43,6 +43,7 @@ export default baseMixins.extend<options>().extend({
       type: String,
       default: '$vuetify.icons.complete',
     },
+    editable: Boolean,
     editIcon: {
       type: String,
       default: '$vuetify.icons.edit',
@@ -51,7 +52,6 @@ export default baseMixins.extend<options>().extend({
       type: String,
       default: '$vuetify.icons.error',
     },
-    editable: Boolean,
     rules: {
       type: Array,
       default: () => [],