diff --git a/themes/grav/css-compiled/template.css b/themes/grav/css-compiled/template.css
index 6d3e4ad5..0eaec9ac 100644
--- a/themes/grav/css-compiled/template.css
+++ b/themes/grav/css-compiled/template.css
@@ -810,6 +810,11 @@ tr {
       flex: 2; }
     tr td:first-child {
       padding-left: 3rem; }
+      @media only all and (max-width: 47.938em) {
+        tr td:first-child {
+          padding-left: .5rem; }
+          tr td:first-child .plugin-update-button {
+            float: left; } }
     tr td:last-child, tr td.gpm-actions {
       padding-right: 3rem; }
     tr td.gpm-actions {
@@ -824,6 +829,9 @@ tr {
       margin: 0;
       padding: 0;
       background-color: #f7f7f7; }
+      @media only all and (max-width: 47.938em) {
+        tr td.gpm-details {
+          word-wrap: break-word; } }
       tr td.gpm-details > .table-wrapper {
         display: none; }
         tr td.gpm-details > .table-wrapper td {
@@ -2375,6 +2383,9 @@ button.toast-close-button {
   padding-bottom: 1rem;
   margin-bottom: 3rem;
   overflow: hidden; }
+  @media only all and (max-width: 47.938em) {
+    .gpm .gpm-item-info {
+      word-wrap: break-word; } }
   .gpm .gpm-item-info .gpm-item-icon {
     color: #e6e6e6;
     position: absolute;
diff --git a/themes/grav/js/admin-all.js b/themes/grav/js/admin-all.js
index d9c5e8f9..d10a3c49 100644
--- a/themes/grav/js/admin-all.js
+++ b/themes/grav/js/admin-all.js
@@ -342,7 +342,7 @@ $(function () {
                             plugin = $('[data-gpm-plugin="' + key + '"] .gpm-name');
                             url = plugin.find('a');
                             if (!plugin.find('.badge.update').length) {
-                                plugin.append('<a href="' + url.attr('href') + '"><span class="badge update">' + translations.PLUGIN_ADMIN.UPDATE_AVAILABLE + '!</span></a>');
+                                plugin.append('<a class="plugin-update-button" href="' + url.attr('href') + '"><span class="badge update">' + translations.PLUGIN_ADMIN.UPDATE_AVAILABLE + '!</span></a>');
                             }
 
                         });
diff --git a/themes/grav/scss/template/_gpm.scss b/themes/grav/scss/template/_gpm.scss
index 99299780..842ea623 100644
--- a/themes/grav/scss/template/_gpm.scss
+++ b/themes/grav/scss/template/_gpm.scss
@@ -46,6 +46,10 @@
         margin-bottom: 3rem;
         overflow: hidden;
 
+        @include breakpoint(mobile-only) {
+            word-wrap: break-word;
+        }
+
         .gpm-item-icon {
             color: darken($content-bg, 3%);
             position: absolute;
@@ -136,4 +140,4 @@
             font-weight: normal;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/themes/grav/scss/template/_tables.scss b/themes/grav/scss/template/_tables.scss
index 16233f02..8ddb6326 100644
--- a/themes/grav/scss/template/_tables.scss
+++ b/themes/grav/scss/template/_tables.scss
@@ -45,6 +45,15 @@ tr {
 
         &:first-child {
             padding-left: $padding-default;
+
+            @include breakpoint(mobile-only) {
+                padding-left: .5rem;
+
+                .plugin-update-button {
+                    float: left;
+                }
+            }
+
         }
 
         &:last-child, &.gpm-actions {
@@ -68,6 +77,10 @@ tr {
             padding: 0;
             background-color: #f7f7f7;
 
+            @include breakpoint(mobile-only){
+                word-wrap: break-word;
+            }
+
             > .table-wrapper {
                 display: none;