diff --git a/Dockerfile b/Dockerfile
index 2b06ded0f..48e48dec6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -79,6 +79,7 @@ RUN cd docker \
 	&& mkdir /var/log/supervisord /var/run/supervisord \
 	&& cp supervisord.conf /etc/supervisord.conf \
 	&& cp docker-entrypoint.sh /sbin/docker-entrypoint.sh \
+	&& cp docker-prepare.sh /sbin/docker-prepare.sh \
 	&& chmod 755 /sbin/docker-entrypoint.sh \
 	&& chmod +x install_management_commands.sh \
 	&& ./install_management_commands.sh \
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
old mode 100644
new mode 100755
index 892462286..e9cfd2b7e
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -15,83 +15,6 @@ map_uidgid() {
     fi
 }
 
-
-wait_for_postgres() {
-	attempt_num=1
-	max_attempts=5
-
-	echo "Waiting for PostgreSQL to start..."
-
-	host="${PAPERLESS_DBHOST}"
-	port="${PAPERLESS_DBPORT}"
-
-	if [[ -z $port ]] ;
-	then
-		port="5432"
-	fi
-
-	while !</dev/tcp/$host/$port ;
-	do
-
-		if [ $attempt_num -eq $max_attempts ]
-		then
-			echo "Unable to connect to database."
-			exit 1
-		else
-			echo "Attempt $attempt_num failed! Trying again in 5 seconds..."
-
-		fi
-
-		attempt_num=$(expr "$attempt_num" + 1)
-		sleep 5
-	done
-
-
-}
-
-superuser() {
-
-    if [[ -n "${PAPERLESS_DBHOST}" ]]
-    then
-        wait_for_postgres
-    fi
-
-    if [[ ! -z "${PAPERLESS_ADMIN_USER}" ]]
-	then
-		sudo -HEu paperless python3 manage.py manage_superuser
-	fi
-
-}
-
-migrations() {
-
-	if [[ -n "${PAPERLESS_DBHOST}" ]]
-	then
-		wait_for_postgres
-	fi
-
-	(
-		# flock is in place to prevent multiple containers from doing migrations
-		# simultaneously. This also ensures that the db is ready when the command
-		# of the current container starts.
-		flock 200
-		echo "Apply database migrations..."
-		sudo -HEu paperless python3 manage.py migrate
-	)  200>/usr/src/paperless/data/migration_lock
-
-}
-
-search_index() {
-	index_version=1
-	index_version_file=/usr/src/paperless/data/.index_version
-
-	if [[ (! -f "$index_version_file") || $(< $index_version_file) != "$index_version" ]]; then
-		echo "Search index out of date. Updating..."
-		sudo -HEu paperless python3 manage.py document_index reindex
-		echo $index_version | sudo -HEu paperless tee $index_version_file >/dev/null
-	fi
-}
-
 initialize() {
 	map_uidgid
 
@@ -106,13 +29,12 @@ initialize() {
 	echo "creating directory /tmp/paperless"
 	mkdir -p /tmp/paperless
 
+    set +e
 	chown -R paperless:paperless ../
 	chown -R paperless:paperless /tmp/paperless
+    set -e
 
-	migrations
-    superuser
-
-	search_index
+    sudo -HEu paperless /sbin/docker-prepare.sh
 }
 
 install_languages() {
@@ -168,4 +90,3 @@ else
 	echo Executing "$@"
 	exec "$@"
 fi
-
diff --git a/docker/docker-prepare.sh b/docker/docker-prepare.sh
new file mode 100755
index 000000000..53f5201e4
--- /dev/null
+++ b/docker/docker-prepare.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+wait_for_postgres() {
+	attempt_num=1
+	max_attempts=5
+
+	echo "Waiting for PostgreSQL to start..."
+
+	host="${PAPERLESS_DBHOST}"
+	port="${PAPERLESS_DBPORT}"
+
+	if [[ -z $port ]] ;
+	then
+		port="5432"
+	fi
+
+	while !</dev/tcp/$host/$port ;
+	do
+
+		if [ $attempt_num -eq $max_attempts ]
+		then
+			echo "Unable to connect to database."
+			exit 1
+		else
+			echo "Attempt $attempt_num failed! Trying again in 5 seconds..."
+
+		fi
+
+		attempt_num=$(expr "$attempt_num" + 1)
+		sleep 5
+	done
+}
+
+
+migrations() {
+	if [[ -n "${PAPERLESS_DBHOST}" ]]
+	then
+		wait_for_postgres
+	fi
+
+	(
+		# flock is in place to prevent multiple containers from doing migrations
+		# simultaneously. This also ensures that the db is ready when the command
+		# of the current container starts.
+		flock 200
+		echo "Apply database migrations..."
+		python3 manage.py migrate
+	)  200>/usr/src/paperless/data/migration_lock
+}
+
+search_index() {
+	index_version=1
+	index_version_file=/usr/src/paperless/data/.index_version
+
+	if [[ (! -f "$index_version_file") || $(< $index_version_file) != "$index_version" ]]; then
+		echo "Search index out of date. Updating..."
+		python3 manage.py document_index reindex
+		echo $index_version | tee $index_version_file >/dev/null
+	fi
+}
+
+do_work() {
+	migrations;
+	
+	search_index;
+}
+
+do_work;
diff --git a/docker/management_script.sh b/docker/management_script.sh
old mode 100644
new mode 100755
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 45b6fad37..1b805bb2e 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -75,7 +75,7 @@
 
 </app-page-header>
 
-<div class="w-100 mb-2 mb-sm-4">
+<div class="sticky-top py-2 mt-n2 mt-sm-n3 py-sm-4 bg-body mx-n3 px-3">
   <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" [unmodifiedFilterRules]="unmodifiedFilterRules" #filterEditor></app-filter-editor>
   <app-bulk-editor [hidden]="!isBulkEditing"></app-bulk-editor>
 </div>
@@ -99,7 +99,7 @@
     <app-document-card-large [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" *ngFor="let d of list.documents; trackBy: trackByDocumentId" [document]="d" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickDocumentType)="clickDocumentType($event)" (clickMoreLike)="clickMoreLike(d.id)">
     </app-document-card-large>
   </div>
-  
+
   <table class="table table-sm border shadow-sm" *ngIf="displayMode == 'details'">
     <thead>
       <th></th>
@@ -174,10 +174,10 @@
       </tr>
     </tbody>
   </table>
-  
+
   <div class="m-n2 row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
     <app-document-card-small [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" [document]="d" *ngFor="let d of list.documents; trackBy: trackByDocumentId" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickDocumentType)="clickDocumentType($event)"></app-document-card-small>
   </div>
-  
+
 
 </ng-template>
diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss
index 28f765e29..ee50852f0 100644
--- a/src-ui/src/app/components/document-list/document-list.component.scss
+++ b/src-ui/src/app/components/document-list/document-list.component.scss
@@ -34,3 +34,12 @@ $paperless-card-breakpoints: (
   right: 0 !important;
   left: auto !important;
 }
+
+.sticky-top {
+  z-index: 1000; // below main navbar
+  top: calc(7rem - 2px); // height of navbar (mobile)
+
+  @media (min-width: 580px) {
+    top: 3.5rem; // height of navbar
+  }
+}
diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss
index df2aea003..113968a9f 100644
--- a/src-ui/src/theme.scss
+++ b/src-ui/src/theme.scss
@@ -4,4 +4,8 @@ $primaryFaded: #d1ddd2;
 
 $theme-colors: (
   "primary": $primary
-);
\ No newline at end of file
+);
+
+.bg-body {
+  background-color: #fff;
+}
diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 996f9da3d..25abac773 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -37,6 +37,10 @@ $border-color-dark-mode: #47494f;
     }
   }
 
+  .bg-body {
+    background-color: $bg-dark-mode !important;
+  }
+
   .text-light {
     color: $text-color-dark-mode !important;
   }