diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.scss b/ui/src/app/workflows/components/workflows-list/workflows-list.scss
index 8b8ca1778941..01b94241d786 100644
--- a/ui/src/app/workflows/components/workflows-list/workflows-list.scss
+++ b/ui/src/app/workflows/components/workflows-list/workflows-list.scss
@@ -1,226 +1,231 @@
 @import 'node_modules/argo-ui/src/styles/config';
 
 .workflows-list {
-  padding: 1em;
+    padding: 1em;
 
-  &__row-container {
-      a {
-        color: $argo-color-gray-6;
-      }
+    &__row-container {
+        a {
+            color: $argo-color-gray-6;
+        }
 
-      a:hover {
-        color: $argo-color-teal-5;
-      }
-  }
+        a:hover {
+            color: $argo-color-teal-5;
+        }
+    }
 
-  &__status {
-    max-width: 80px;
-    display: flex; 
-    align-items: center; 
+    &__status {
+        max-width: 80px;
+        display: flex;
+        align-items: center;
 
-    &--checkbox {
-      margin-right: 12px;
+        &--checkbox {
+            margin-right: 12px;
+        }
     }
-  }
 
-  &__link-wrapper {
-    display: flex;
-    width: 100%;
-  }
+    &__link-wrapper {
+        display: flex;
+        width: 100%;
+    }
 
-  &__labels-container {
-    height: 100%;
-  }
+    &__labels-container {
+        height: 100%;
+    }
 
-  &__title {
-    font-weight: bolder;
-    font-size: 15px;
-    color: $argo-color-gray-6;
-    padding-top: 0.25em;
-    padding-bottom: 0.5em;
-  }
+    &__title {
+        font-weight: bolder;
+        font-size: 15px;
+        color: $argo-color-gray-6;
+        padding-top: 0.25em;
+        padding-bottom: 0.5em;
+    }
 
-  &__info {
-    line-height: 24px;
-    margin: 1em 0;
-  }
+    &__info {
+        line-height: 24px;
+        margin: 1em 0;
+    }
 
-  &__icons {
-    line-height: 24px;
-  }
+    &__icons {
+        line-height: 24px;
+    }
 
-  &__empty-state {
-    text-align: center;
-  }
+    &__empty-state {
+        text-align: center;
+    }
 
-  &__entry {
-    padding-left: 1em;
-    border-left: 5px solid $argo-color-gray-4;
+    &__entry {
+        padding-left: 1em;
+        border-left: 5px solid $argo-color-gray-4;
 
-    // healthy statuses
+        // healthy statuses
 
-    &--comparison-Synced {
-      border-left-color: $argo-success-color;
-    }
+        &--comparison-Synced {
+            border-left-color: $argo-success-color;
+        }
 
-    &--health-Healthy {
-      border-left-color: $argo-success-color;
-    }
+        &--health-Healthy {
+            border-left-color: $argo-success-color;
+        }
 
-    // having this higher up ensures that progressing takes precedence
-    &--comparison-OutOfSync {
-      border-left-color: $argo-status-warning-color;
-    }
+        // having this higher up ensures that progressing takes precedence
+        &--comparison-OutOfSync {
+            border-left-color: $argo-status-warning-color;
+        }
 
-    // intermediate statuses
+        // intermediate statuses
 
-    &--health-Progressing {
-      border-left-color: $argo-running-color;
-    }
+        &--health-Progressing {
+            border-left-color: $argo-running-color;
+        }
 
-    // failed statuses
+        // failed statuses
 
-    &--health-Degraded {
-      border-left-color: $argo-failed-color;
-    }
+        &--health-Degraded {
+            border-left-color: $argo-failed-color;
+        }
 
-    &--comparison-Error {
-      border-left-color: $argo-failed-color;
+        &--comparison-Error {
+            border-left-color: $argo-failed-color;
+        }
+
+        &--actions {
+            padding-top: 1em;
+        }
     }
 
-    &--actions {
-      padding-top: 1em;
+    &__filters-expander {
+        position: absolute;
+        top: 0.75em;
+        right: 1em;
+        cursor: pointer;
     }
-  }
 
-  &__filters-expander {
-    position: absolute;
-    top: 0.75em;
-    right: 1em;
-    cursor: pointer;
-  }
+    &__filters-container {
+        max-height: 2.5em;
+        overflow: hidden;
+        position: relative;
+        border-radius: $border-radius;
+        box-shadow: 1px 1px 3px $argo-color-gray-5;
+        padding: 0 1em 0.75em 1em;
+        margin: 33px 0;
+        background-color: white;
+        transition: max-height 0.25s cubic-bezier(0, 1, 0, 1);
 
-  &__filters-container {
-    max-height: 2.5em;
-    overflow: hidden;
-    position: relative;
-    border-radius: $border-radius;
-    box-shadow: 1px 1px 3px $argo-color-gray-5;
-    padding: 0 1em 0.75em 1em;
-    margin: 33px 0;
-    background-color: white;
-    transition: max-height 0.25s cubic-bezier(0, 1, 0, 1);
+        ul,
+        a,
+        p {
+            margin: 0;
+        }
 
-    ul, a, p {
-      margin: 0;
-    }
+        p {
+            margin-top: 1em;
+            color: $argo-color-gray-6;
+            text-transform: uppercase;
+        }
+
+        &::before {
+            content: 'FILTERS';
+            display: block;
+            color: $argo-color-gray-6;
+            padding-bottom: 1em;
+            margin-top: 0.5em;
+        }
 
-    p {
-      margin-top: 1em;
-      color: $argo-color-gray-6;
-      text-transform: uppercase;
+        &--expanded {
+            overflow-y: auto;
+            max-height: calc(1.55em * 15);
+            transition: max-height 1s ease-in-out;
+            &::before {
+                display: none;
+            }
+        }
     }
 
-    &::before {
-      content: 'FILTERS';
-      display: block;
-      color: $argo-color-gray-6;
-      padding-bottom: 1em;
-      margin-top: 0.5em;
+    &__filters-container-title {
+        border-bottom: 1px solid $argo-color-gray-3;
+        margin-bottom: 1em;
     }
 
-    &--expanded {
-      overflow-y: auto;
-      max-height: calc(1.55em * 15);
-      transition: max-height 1s ease-in-out;
-      &::before {
+    &__filter {
+        li {
+            list-style: none;
+        }
+        max-height: calc(1.55em * 10);
+        transition: max-height 0.25s cubic-bezier(0, 1, 0, 1);
+        overflow-y: auto;
+    }
+
+    &__filter-expander {
         display: none;
-      }
-    }
-  }
-
-  &__filters-container-title {
-    border-bottom: 1px solid $argo-color-gray-3;
-    margin-bottom: 1em;
-  }
-
-  &__filter {
-    li {
-      list-style: none;
-    }
-    max-height: calc(1.55em * 10);
-    transition: max-height 0.25s cubic-bezier(0, 1, 0, 1);
-    overflow-y: auto;
-  }
-
-  &__filter-expander {
-    display: none;
-  }
-
-  &__view-type {
-    white-space: nowrap;
-    i {
-      cursor: pointer;
-      color:  $argo-color-gray-4;
-      margin-right: 1em;
-      &::before {
-        font-size: 1.5em;
-      }
-    }
-    i.selected {
-      cursor: default;
-      color: $argo-color-teal-5;
-    }
-  }
-
-
-  &__filter-label {
-    vertical-align: bottom;
-    width: calc(100% - 50px);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: inline-block;
-    white-space: nowrap;
-    margin-right: 10px;
-  }
-
-  &__table-icon {
-    display: inline-block;
-    margin-right: 10px;
-    width: 80px;
-  }
-
-  &__table-row {
-    & > .columns:first-child {
-      padding-left: 30px;
-    }
-    margin-left: -30px !important;
-  }
-
-  &__search {
-    position: relative;
-    i.fa-search {
-      position: absolute;
-      bottom: 0.6em;
-      left: -1.5em;
-    }
-    i.fa-times {
-      cursor: pointer;
-      position: absolute;
-      color: $argo-color-gray-5;
-      bottom: 0.6em;
-      right: 0;
-      z-index: 1;
-    }
-    .select {
-      width: 100%;
-      border-radius: $border-radius;
-    }
-  }
-
-  &__external-link {
-    position: absolute;
-    top: 1em;
-    right: 1em;
-  }
+    }
+
+    &__view-type {
+        white-space: nowrap;
+        i {
+            cursor: pointer;
+            color: $argo-color-gray-4;
+            margin-right: 1em;
+            &::before {
+                font-size: 1.5em;
+            }
+        }
+        i.selected {
+            cursor: default;
+            color: $argo-color-teal-5;
+        }
+    }
+
+    &__filter-label {
+        vertical-align: bottom;
+        width: calc(100% - 50px);
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: inline-block;
+        white-space: nowrap;
+        margin-right: 10px;
+    }
+
+    &__table-icon {
+        display: inline-block;
+        margin-right: 10px;
+        width: 80px;
+    }
+
+    &__table-row {
+        & > .columns:first-child {
+            padding-left: 30px;
+        }
+        margin-left: -30px !important;
+    }
+
+    &__search {
+        position: relative;
+        i.fa-search {
+            position: absolute;
+            bottom: 0.6em;
+            left: -1.5em;
+        }
+        i.fa-times {
+            cursor: pointer;
+            position: absolute;
+            color: $argo-color-gray-5;
+            bottom: 0.6em;
+            right: 0;
+            z-index: 1;
+        }
+        .select {
+            width: 100%;
+            border-radius: $border-radius;
+        }
+    }
+
+    &__external-link {
+        position: absolute;
+        top: 1em;
+        right: 1em;
+    }
+}
+
+.row.pt-60 {
+    padding-top: 60px;
 }
diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx
index c6a800a54b52..83a4dae3125c 100644
--- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx
+++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx
@@ -205,7 +205,7 @@ export class WorkflowsList extends BasePage<RouteComponentProps<any>, State> {
                                     }}
                                     isDisabled={this.state.batchActionDisabled}
                                 />
-                                <div className='row'>
+                                <div className={`row ${this.state.selectedWorkflows.size === 0 ? '' : 'pt-60'}`}>
                                     <div className='columns small-12 xlarge-2'>
                                         <WorkflowsSummaryContainer workflows={this.state.workflows} />
                                         <div>
diff --git a/ui/src/app/workflows/components/workflows-toolbar/workflows-toolbar.scss b/ui/src/app/workflows/components/workflows-toolbar/workflows-toolbar.scss
index 7ec4cc08bb3e..ff6de96718a4 100644
--- a/ui/src/app/workflows/components/workflows-toolbar/workflows-toolbar.scss
+++ b/ui/src/app/workflows/components/workflows-toolbar/workflows-toolbar.scss
@@ -1,46 +1,50 @@
 @import 'node_modules/argo-ui/src/styles/config';
 
 .workflows-toolbar {
-  background: $argo-color-gray-2;
-  padding: 0.5em 20px;
-  margin-bottom: 0.5em;
-  display: flex;
-  align-items: center;
-  position: -webkit-sticky;
-  font-size: 15px;
+    width: calc(100% - 60px);
+    background: $argo-color-gray-2;
+    padding: 0.5em 20px;
+    margin-bottom: 0.5em;
+    display: flex;
+    align-items: center;
+    position: fixed;
+    right: 0px;
+    top: calc(50px * 2);
+    font-size: 15px;
+    z-index: 10;
 
-  &__actions {
-    margin-left: auto;
-    line-height: 3em;
-    &--action {
-      cursor: pointer;
-      color: white;
-      border-radius: 3px;
-      padding: 0.5em 10px;
-      margin-right: 10px;
-      background-color: $argo-color-gray-6;
-    }
+    &__actions {
+        margin-left: auto;
+        line-height: 3em;
+        &--action {
+            cursor: pointer;
+            color: white;
+            border-radius: 3px;
+            padding: 0.5em 10px;
+            margin-right: 10px;
+            background-color: $argo-color-gray-6;
+        }
 
-    button:disabled {
-      background-color: $argo-color-gray-4;
-      cursor: not-allowed;
-      color: $argo-color-gray-6;
-    }
+        button:disabled {
+            background-color: $argo-color-gray-4;
+            cursor: not-allowed;
+            color: $argo-color-gray-6;
+        }
 
-    &--suspend {
-      background-color: $argo-color-gray-6;
-    }
+        &--suspend {
+            background-color: $argo-color-gray-6;
+        }
 
-    &--resume {
-      background-color: $argo-color-green;
-    }
+        &--resume {
+            background-color: $argo-color-green;
+        }
 
-    &--delete {
-      background-color: $argo-color-red;
+        &--delete {
+            background-color: $argo-color-red;
+        }
     }
-  }
 }
 
 .workflows-toolbar.hidden {
-  display: none;
+    display: none;
 }