diff --git a/app/components/Toasts/components/Toast.js b/app/components/Toasts/components/Toast.js
index b0d717609..4692f5ba9 100644
--- a/app/components/Toasts/components/Toast.js
+++ b/app/components/Toasts/components/Toast.js
@@ -15,7 +15,7 @@ class Toast extends React.Component<Props> {
   timeout: TimeoutID;
 
   static defaultProps = {
-    closeAfterMs: 30000,
+    closeAfterMs: 3000,
   };
 
   componentDidMount() {
diff --git a/app/stores/UiStore.test.js b/app/stores/UiStore.test.js
index 5eeb09308..4842cb25d 100644
--- a/app/stores/UiStore.test.js
+++ b/app/stores/UiStore.test.js
@@ -9,20 +9,20 @@ describe('UiStore', () => {
     store = stores.ui;
   });
 
-  test('#add should add errors', () => {
-    expect(store.toasts.length).toBe(0);
+  test('#add should add messages', () => {
+    expect(store.orderedToasts.length).toBe(0);
     store.showToast('first error');
     store.showToast('second error');
-    expect(store.toasts.length).toBe(2);
+    expect(store.orderedToasts.length).toBe(2);
   });
 
-  test('#remove should remove errors', () => {
-    store.toasts = [];
-    store.showToast('first error');
+  test('#remove should remove messages', () => {
+    store.toasts.clear();
+    const id = store.showToast('first error');
     store.showToast('second error');
-    expect(store.toasts.length).toBe(2);
-    store.removeToast(0);
-    expect(store.toasts.length).toBe(1);
-    expect(store.toasts[0].message).toBe('second error');
+    expect(store.orderedToasts.length).toBe(2);
+    store.removeToast(id);
+    expect(store.orderedToasts.length).toBe(1);
+    expect(store.orderedToasts[0].message).toBe('second error');
   });
 });