diff --git a/src/App.scss b/src/App.scss
index ee20cf2b..4244391b 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -1,4 +1,4 @@
-@import "./utils/base";
+@import './utils/base';
 
 .app {
   padding-top: $headerHeight;
diff --git a/src/common/AsideMenu.scss b/src/common/AsideMenu.scss
index 5278a2a6..94664bb7 100644
--- a/src/common/AsideMenu.scss
+++ b/src/common/AsideMenu.scss
@@ -1,4 +1,4 @@
-@import "../utils/base";
+@import '../utils/base';
 
 .aside-menu {
   background-color: #f7f7f7;
diff --git a/src/common/DateInput.scss b/src/common/DateInput.scss
index bdb61eb6..f9f41b71 100644
--- a/src/common/DateInput.scss
+++ b/src/common/DateInput.scss
@@ -1,4 +1,4 @@
-@import "../utils/mixins/vertical-align";
+@import '../utils/mixins/vertical-align';
 
 .date-input-container {
   position: relative;
diff --git a/src/common/Home.scss b/src/common/Home.scss
index 07669eb6..7641664b 100644
--- a/src/common/Home.scss
+++ b/src/common/Home.scss
@@ -1,4 +1,4 @@
-@import "../utils/base";
+@import '../utils/base';
 
 .home-container {
   text-align: center;
diff --git a/src/common/MainHeader.scss b/src/common/MainHeader.scss
index a3f7f64c..9c2dca92 100644
--- a/src/common/MainHeader.scss
+++ b/src/common/MainHeader.scss
@@ -1,4 +1,4 @@
-@import "../utils/base";
+@import '../utils/base';
 
 .main-header.main-header {
   background-color: $mainColor !important;
diff --git a/src/index.scss b/src/index.scss
index c496bd8a..cb686abc 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -1,4 +1,4 @@
-@import "./utils/base";
+@import './utils/base';
 
 * {
   outline: none !important;
diff --git a/src/servers/CreateServer.scss b/src/servers/CreateServer.scss
index e4b760ad..f4ade34f 100644
--- a/src/servers/CreateServer.scss
+++ b/src/servers/CreateServer.scss
@@ -1,4 +1,4 @@
-@import "../utils/base";
+@import '../utils/base';
 
 .create-server {
   padding: 40px 20px;
diff --git a/src/short-urls/CreateShortUrl.scss b/src/short-urls/CreateShortUrl.scss
index 4c4199b9..7967eb77 100644
--- a/src/short-urls/CreateShortUrl.scss
+++ b/src/short-urls/CreateShortUrl.scss
@@ -1,6 +1,6 @@
-@import "../../node_modules/react-tag-autocomplete/example/styles.css";
-@import "../utils/mixins/box-shadow";
-@import "../utils/mixins/border-radius";
+@import '../../node_modules/react-tag-autocomplete/example/styles.css';
+@import '../utils/mixins/box-shadow';
+@import '../utils/mixins/border-radius';
 
 .create-short-url__btn:not(:first-child) {
   margin-left: 5px;
diff --git a/src/short-urls/SearchBar.scss b/src/short-urls/SearchBar.scss
index 3e042a55..009de586 100644
--- a/src/short-urls/SearchBar.scss
+++ b/src/short-urls/SearchBar.scss
@@ -1,4 +1,4 @@
-@import "../utils/mixins/vertical-align";
+@import '../utils/mixins/vertical-align';
 
 .search-bar {
   position: relative;
diff --git a/src/short-urls/ShortUrlsList.scss b/src/short-urls/ShortUrlsList.scss
index 514d5622..df2cf01d 100644
--- a/src/short-urls/ShortUrlsList.scss
+++ b/src/short-urls/ShortUrlsList.scss
@@ -1,4 +1,4 @@
-@import "../utils/base";
+@import '../utils/base';
 
 .short-urls-list__header {
   @media (max-width: $smMax) {
diff --git a/src/short-urls/helpers/PreviewModal.scss b/src/short-urls/helpers/PreviewModal.scss
index 4ac6c972..546b4980 100644
--- a/src/short-urls/helpers/PreviewModal.scss
+++ b/src/short-urls/helpers/PreviewModal.scss
@@ -1,4 +1,4 @@
-@import "../../utils/mixins/horizontal-align";
+@import '../../utils/mixins/horizontal-align';
 
 .preview-modal__img {
   max-width: 100%;
diff --git a/src/short-urls/helpers/ShortUrlsRow.js b/src/short-urls/helpers/ShortUrlsRow.js
index d57bac2f..d3534e45 100644
--- a/src/short-urls/helpers/ShortUrlsRow.js
+++ b/src/short-urls/helpers/ShortUrlsRow.js
@@ -6,7 +6,7 @@ import './ShortUrlsRow.scss';
 import { ShortUrlsRowMenu } from './ShortUrlsRowMenu';
 
 export class ShortUrlsRow extends React.Component {
-  state = { displayMenu: false, copiedToClipboard: false };
+  state = { copiedToClipboard: false };
 
   renderTags(tags) {
     if (isEmpty(tags)) {
@@ -25,11 +25,7 @@ export class ShortUrlsRow extends React.Component {
     const completeShortUrl = !selectedServer ? shortUrl.shortCode : `${selectedServer.url}/${shortUrl.shortCode}`;
 
     return (
-      <tr
-        className="short-urls-row"
-        onMouseEnter={() => this.setState({displayMenu: true})}
-        onMouseLeave={() => this.setState({displayMenu: false})}
-      >
+      <tr className="short-urls-row">
         <td className="nowrap short-urls-row__cell" data-th="Created at: ">
           <Moment format="YYYY-MM-DD HH:mm">{shortUrl.dateCreated}</Moment>
         </td>
@@ -49,7 +45,6 @@ export class ShortUrlsRow extends React.Component {
             Copied short URL!
           </small>
           <ShortUrlsRowMenu
-            display={this.state.displayMenu}
             shortUrl={completeShortUrl}
             selectedServer={selectedServer}
             shortCode={shortUrl.shortCode}
diff --git a/src/short-urls/helpers/ShortUrlsRow.scss b/src/short-urls/helpers/ShortUrlsRow.scss
index 7153dc02..34ef0f5d 100644
--- a/src/short-urls/helpers/ShortUrlsRow.scss
+++ b/src/short-urls/helpers/ShortUrlsRow.scss
@@ -1,11 +1,12 @@
-@import "../../utils/base";
-@import "../../utils/mixins/vertical-align";
+@import '../../utils/base';
+@import '../../utils/mixins/vertical-align';
 
 .short-urls-row {
   @media (max-width: $smMax) {
     display: block;
     margin-bottom: 10px;
     border-bottom: 1px solid $lightGrey;
+    position: relative;
   }
 }
 
@@ -25,7 +26,11 @@
     }
 
     &:last-child {
-      display: none;
+      position: absolute;
+      top: 3px;
+      right: .5rem;
+      width: auto;
+      padding: 0;
     }
   }
 }
diff --git a/src/short-urls/helpers/ShortUrlsRowMenu.js b/src/short-urls/helpers/ShortUrlsRowMenu.js
index 4700c625..37e9ac9e 100644
--- a/src/short-urls/helpers/ShortUrlsRowMenu.js
+++ b/src/short-urls/helpers/ShortUrlsRowMenu.js
@@ -17,16 +17,14 @@ export class ShortUrlsRowMenu extends React.Component {
   toggle = () => this.setState({ isOpen: !this.state.isOpen });
 
   render() {
-    const { display, shortUrl, onCopyToClipboard, selectedServer, shortCode } = this.props;
+    const { shortUrl, onCopyToClipboard, selectedServer, shortCode } = this.props;
     const serverId = selectedServer ? selectedServer.id : '';
-    const baseClass = 'short-urls-row-menu__dropdown-toggle';
-    const toggleClass = !display ? `${baseClass} short-urls-row-menu__dropdown-toggle--hidden` : baseClass;
     const toggleQrCode = () => this.setState({isQrModalOpen: !this.state.isQrModalOpen});
     const togglePreview = () => this.setState({isPreviewOpen: !this.state.isPreviewOpen});
 
     return (
       <ButtonDropdown toggle={this.toggle} isOpen={this.state.isOpen} direction="left">
-        <DropdownToggle color="white" size="sm" caret className={toggleClass}>
+        <DropdownToggle color="white" size="sm" caret className="short-urls-row-menu__dropdown-toggle">
           &nbsp;<FontAwesomeIcon icon={menuIcon}/>&nbsp;
         </DropdownToggle>
         <DropdownMenu>