diff --git a/lib/ui/password_reentry_page.dart b/lib/ui/password_reentry_page.dart
index 8c010064b15f9e1c43bd799750e5184d339fd2f5..c61bb71a15f10f0c68943cdc07f34a173aa2ad13 100644
--- a/lib/ui/password_reentry_page.dart
+++ b/lib/ui/password_reentry_page.dart
@@ -18,7 +18,7 @@ class PasswordReentryPage extends StatefulWidget {
 
 class _PasswordReentryPageState extends State<PasswordReentryPage> {
   final _passwordController = TextEditingController();
-  FocusNode _passwordFocusNode = FocusNode();
+  final FocusNode _passwordFocusNode = FocusNode();
   bool _passwordInFocus = false;
   bool _passwordVisible = false;
 
diff --git a/lib/ui/progress_dialog.dart b/lib/ui/progress_dialog.dart
index 0d8aeae1e63830193747abc0306970a61d51dfdc..c4a6bfc55ae2e409eabf0889e938f3b9b2e1f650 100644
--- a/lib/ui/progress_dialog.dart
+++ b/lib/ui/progress_dialog.dart
@@ -180,7 +180,7 @@ class ProgressDialog {
 
 // ignore: must_be_immutable
 class _Body extends StatefulWidget {
-  _BodyState _dialog = _BodyState();
+  final _BodyState _dialog = _BodyState();
 
   update() {
     _dialog.update();
diff --git a/lib/ui/shared_collections_gallery.dart b/lib/ui/shared_collections_gallery.dart
index 14deb8e8e1903e274275a36a1ac5e2907123c5d4..db59191f682eb51200e6f6e29c874c79e94c9822 100644
--- a/lib/ui/shared_collections_gallery.dart
+++ b/lib/ui/shared_collections_gallery.dart
@@ -31,7 +31,7 @@ class SharedCollectionGallery extends StatefulWidget {
 
 class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
     with AutomaticKeepAliveClientMixin {
-  Logger _logger = Logger("SharedCollectionGallery");
+  final Logger _logger = Logger("SharedCollectionGallery");
   StreamSubscription<LocalPhotosUpdatedEvent> _localFilesSubscription;
   StreamSubscription<CollectionUpdatedEvent> _collectionUpdatesSubscription;
   StreamSubscription<UserLoggedOutEvent> _loggedOutEvent;