diff --git a/js/views/toast_view.js b/js/views/toast_view.js
index cd8a96323..9d4d0b6ea 100644
--- a/js/views/toast_view.js
+++ b/js/views/toast_view.js
@@ -25,7 +25,7 @@
         )
       );
       this.$el.show();
-      setTimeout(this.close.bind(this), 2000000);
+      setTimeout(this.close.bind(this), 2000);
     },
   });
 
diff --git a/ts/components/session/SessionToast.tsx b/ts/components/session/SessionToast.tsx
index b461e3b06..728be1455 100644
--- a/ts/components/session/SessionToast.tsx
+++ b/ts/components/session/SessionToast.tsx
@@ -52,6 +52,8 @@ export class SessionToast extends React.PureComponent<Props> {
         toastIcon = SessionIconType.Globe;
     }
 
+    setTimeout(this.fadeToast.bind(this), 5000);
+
     return (
       <div className={classNames('session-toast', type)}>
         <div className="toast-icon">
@@ -75,7 +77,11 @@ export class SessionToast extends React.PureComponent<Props> {
     );
   }
 
+  public fadeToast() {
+    $('.session-toast').fadeOut(500);
+  }
+
   public closeToast() {
-    return;
+    $('.session-toast').fadeOut(125);
   }
 }