diff --git a/src/internal-packages/indexes/lib/component/create-index-checkbox.jsx b/src/internal-packages/indexes/lib/component/create-index-checkbox.jsx
index ef7bb0fd6fc..584b48ad747 100644
--- a/src/internal-packages/indexes/lib/component/create-index-checkbox.jsx
+++ b/src/internal-packages/indexes/lib/component/create-index-checkbox.jsx
@@ -40,6 +40,7 @@ class CreateIndexCheckbox extends React.Component {
   render() {
     return (
       <div className="create-index-checkbox">
+        <label>
         <input
           type="checkbox"
           checked={this.state.checked}
@@ -48,6 +49,7 @@ class CreateIndexCheckbox extends React.Component {
         <p className="create-index-checkbox-description">
           {this.props.description}
         </p>
+        </label>
       </div>
     );
   }
diff --git a/src/internal-packages/indexes/lib/component/create-index-modal.jsx b/src/internal-packages/indexes/lib/component/create-index-modal.jsx
index 50a18bb69ee..738980cc3b3 100644
--- a/src/internal-packages/indexes/lib/component/create-index-modal.jsx
+++ b/src/internal-packages/indexes/lib/component/create-index-modal.jsx
@@ -33,7 +33,7 @@ class CreateIndexModal extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      showOptions: false,
+      showOptions: true,
       error: false,
       errorMessage: '',
       inProgress: false,
diff --git a/src/internal-packages/indexes/styles/create-index-modal.less b/src/internal-packages/indexes/styles/create-index-modal.less
index 492947c7a0b..89e54ee6bae 100644
--- a/src/internal-packages/indexes/styles/create-index-modal.less
+++ b/src/internal-packages/indexes/styles/create-index-modal.less
@@ -48,6 +48,7 @@
         background: #fff;
         border-color: #ddd;
         border-radius: 2px;
+        cursor: pointer;
       }
     }
 
@@ -57,6 +58,7 @@
 
         .create-index-checkbox-input {
           font-size: 120%;
+          cursor: pointer;
         }
 
         .create-index-checkbox-description {
@@ -64,6 +66,7 @@
           font-weight: normal;
           margin-bottom: 4px;
           margin-left: 10px;
+          cursor: pointer;
         }
       }
 
@@ -85,6 +88,7 @@
 
           &[disabled] {
             border: 1px solid rgba(204, 204, 204, 0.3);
+            cursor: not-allowed;
           }
         }
 
@@ -105,6 +109,7 @@
     }
 
     .options-toggle-bar {
+      cursor: pointer;
       .options-toggle-bar-header {
         margin-top: 10px;