diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
index d49d415bf9..222dd55902 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
@@ -104,9 +104,8 @@ const StyledTabsContainer = styled.div`
     top: ${({ theme }) => theme.gridUnit * 2}px;
   }
 
-  .editable-title input {
-    cursor: pointer;
-    text-transform: uppercase;
+  div .ant-tabs-tab-btn {
+    text-transform: none;
   }
 `;
 
diff --git a/superset-frontend/src/visualizations/FilterBox/FilterBox.less b/superset-frontend/src/visualizations/FilterBox/FilterBox.less
index f200bc6fc1..b1252b275d 100644
--- a/superset-frontend/src/visualizations/FilterBox/FilterBox.less
+++ b/superset-frontend/src/visualizations/FilterBox/FilterBox.less
@@ -56,11 +56,15 @@
 .filter-container {
   display: flex;
   flex-direction: column;
+  margin-bottom: 10px;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
 
   label {
     display: flex;
     font-weight: @font-weight-bold;
-    margin: 0 0 8px 8px;
   }
 
   .filter-badge-container {