diff --git a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
index 58d3d4856afc5..0469b4b916a7c 100644
--- a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
+++ b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
@@ -60,9 +60,10 @@ export const Label = styled.div`
       margin-left: ${theme.gridUnit}px;
     }
     .type-label {
-      margin-right: ${theme.gridUnit}px;
+      margin-right: ${theme.gridUnit * 2}px;
       margin-left: ${theme.gridUnit}px;
       font-weight: ${theme.typography.weights.normal};
+      width: auto;
     }
     .option-label {
       display: inline;
diff --git a/superset-frontend/src/explore/components/optionRenderers.tsx b/superset-frontend/src/explore/components/optionRenderers.tsx
index aa6bd9327c9bc..74d2891df9104 100644
--- a/superset-frontend/src/explore/components/optionRenderers.tsx
+++ b/superset-frontend/src/explore/components/optionRenderers.tsx
@@ -43,8 +43,7 @@ const OptionContainer = styled.div`
   }
   .type-label {
     margin-right: ${({ theme }) => theme.gridUnit * 3}px;
-    margin-left: ${({ theme }) => theme.gridUnit * 3}px;
-    width: ${({ theme }) => theme.gridUnit * 4}px;
+    width: ${({ theme }) => theme.gridUnit * 7}px;
     display: inline-block;
     text-align: center;
     font-weight: ${({ theme }) => theme.typography.weights.bold};