diff --git a/core/modules/shortcut/shortcut.base.css b/core/modules/shortcut/shortcut.base.css
index 8575904..14d5741 100644
--- a/core/modules/shortcut/shortcut.base.css
+++ b/core/modules/shortcut/shortcut.base.css
@@ -16,7 +16,7 @@
   float: left; /* LTR */
   padding-top: 2px;
 }
-.add-or-remove-shortcuts a:focus .text,
-.add-or-remove-shortcuts a:hover .text {
+.no-touch .add-or-remove-shortcuts a:focus .text,
+.no-touch .add-or-remove-shortcuts a:hover .text {
   display: block;
 }
diff --git a/core/modules/shortcut/shortcut.theme-rtl.css b/core/modules/shortcut/shortcut.theme-rtl.css
index a0df7e8..7bc7399 100644
--- a/core/modules/shortcut/shortcut.theme-rtl.css
+++ b/core/modules/shortcut/shortcut.theme-rtl.css
@@ -11,12 +11,12 @@
   margin-left: 4px;
   margin-right: 8px;
 }
-.add-shortcut a:focus .icon,
-.add-shortcut a:hover .icon {
+.no-touch .add-shortcut a:focus .icon,
+.no-touch .add-shortcut a:hover .icon {
   background-position: 0 -24px;
 }
-.remove-shortcut a:focus .icon,
-.remove-shortcut a:hover .icon {
+.no-touch .remove-shortcut a:focus .icon,
+.no-touch .remove-shortcut a:hover .icon {
   background-position: -12px -24px;
 }
 .add-or-remove-shortcuts .text {
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 72ce5e6..bbd9712 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -215,6 +215,7 @@ pre {
   font-size: 1.385em;
   font-weight: normal;
   float: left; /* LTR */
+  max-width: 89%;
 }
 
 /**
@@ -1021,11 +1022,26 @@ h1#overlay-title {
 }
 
 /* Shortcut theming */
-div.add-or-remove-shortcuts {
+.add-or-remove-shortcuts {
   float: left; /* LTR */
   padding-top: 0;
   padding-left: 6px; /* LTR */
 }
+@media all and (max-width: 851px) {
+  .no-touch .add-or-remove-shortcuts {
+    float: none;
+    height: 20px;
+    overflow: hidden;
+    padding: 0 0 10px 0;
+    width: 100%;
+  }
+  .no-touch .add-or-remove-shortcuts .icon {
+    margin-left: 0;
+  }
+  .no-touch .add-or-remove-shortcuts .text {
+    padding-top: 0;
+  }
+}
 
 /* Field UI */