diff --git a/src/components/audio-trimmer/audio-trimmer.css b/src/components/audio-trimmer/audio-trimmer.css
index bfb27c677c7942849436350290e7f0b5402135cb..f3ce9fa42f8a697af0e7570f3eff5cda49258c3f 100644
--- a/src/components/audio-trimmer/audio-trimmer.css
+++ b/src/components/audio-trimmer/audio-trimmer.css
@@ -94,19 +94,19 @@ $hover-scale: 1.25;
 }
 
 .selector .left-handle {
-    left: 0
+    left: -1px
 }
 
 .selector .right-handle {
-    right: 0
+    right: -1px
 }
 
 .trimmer .left-handle {
-    right: 0
+    right: -1px
 }
 
 .trimmer .right-handle {
-    left: 0
+    left: -1px
 }
 
 .trim-handle {
diff --git a/src/containers/audio-selector.jsx b/src/containers/audio-selector.jsx
index e3eaf3ab3edabc5769a7f199557a214bdc668c38..2d5974d5ce8cd69ee2dd7a2ed8e9c592b94955e6 100644
--- a/src/containers/audio-selector.jsx
+++ b/src/containers/audio-selector.jsx
@@ -75,7 +75,8 @@ class AudioSelector extends React.Component {
             });
         } else {
             this.setState({
-                trimStart: newTrim
+                trimStart: newTrim,
+                trimEnd: this.initialTrimEnd
             });
         }
     }
@@ -89,6 +90,7 @@ class AudioSelector extends React.Component {
             });
         } else {
             this.setState({
+                trimStart: this.initialTrimStart,
                 trimEnd: newTrim
             });
         }