diff --git a/frontend/src/metabase/admin/datamodel/components/database/MetadataSchemaList.jsx b/frontend/src/metabase/admin/datamodel/components/database/MetadataSchemaList.jsx
index 406ea592c90ea4310807264463fc83c7432076ad..5d546b1c7d8283d331437285340763de1b3b8212 100644
--- a/frontend/src/metabase/admin/datamodel/components/database/MetadataSchemaList.jsx
+++ b/frontend/src/metabase/admin/datamodel/components/database/MetadataSchemaList.jsx
@@ -59,7 +59,7 @@ export default class MetadataSchemaList extends Component {
             <li key={schema}>
               <a
                 className={cx(
-                  "AdminList-item flex align-center no-decoration",
+                  "AdminList-item flex align-center no-decoration text-wrap",
                   {
                     selected: selectedSchema && selectedSchema === schema,
                   },
diff --git a/frontend/src/metabase/admin/datamodel/components/database/MetadataTableList.jsx b/frontend/src/metabase/admin/datamodel/components/database/MetadataTableList.jsx
index 19fbd80db8e6d19a0323503b2aefbbdd0902b7e0..162ba064505db9e94c87221562724b244d87afad 100644
--- a/frontend/src/metabase/admin/datamodel/components/database/MetadataTableList.jsx
+++ b/frontend/src/metabase/admin/datamodel/components/database/MetadataTableList.jsx
@@ -71,7 +71,7 @@ export default class MetadataTableList extends Component {
 
     if (queryableTables.length > 0) {
       queryableTablesHeader = (
-        <li className="AdminList-section">
+        <li className="AdminList-section flex justify-between align-center">
           {(n =>
             ngettext(msgid`${n} Queryable Table`, `${n} Queryable Tables`, n))(
             queryableTables.length,
@@ -117,7 +117,7 @@ export default class MetadataTableList extends Component {
           />
         </div>
         {(this.props.onBack || this.props.schema) && (
-          <h4 className="p2 border-bottom">
+          <h4 className="p2 border-bottom break-anywhere">
             {this.props.onBack && (
               <span
                 className="text-brand cursor-pointer"
diff --git a/frontend/src/metabase/css/core/text.css b/frontend/src/metabase/css/core/text.css
index 0e8d1259ff38ae9911b3f0f093edf474b81f4546..a04fae001cce7a7875763c0b7019ca4095fa4ad2 100644
--- a/frontend/src/metabase/css/core/text.css
+++ b/frontend/src/metabase/css/core/text.css
@@ -218,3 +218,7 @@
 .text-measure {
   max-width: 620px;
 }
+
+.break-anywhere {
+  line-break: anywhere;
+}