diff --git a/SOURCES/0001-Always-close-the-password-dialog.patch b/SOURCES/0001-Always-close-the-password-dialog.patch
new file mode 100644
index 0000000..7ece4d6
--- /dev/null
+++ b/SOURCES/0001-Always-close-the-password-dialog.patch
@@ -0,0 +1,42 @@
+From 8e0c75a0fbc4fc9496e1fcef0ce21fa8e28facc8 Mon Sep 17 00:00:00 2001
+From: Vendula Poncova <vponcova@redhat.com>
+Date: Mon, 29 Jul 2019 18:28:18 +0200
+Subject: [PATCH] Always close the password dialog
+
+The password dialog should be closed even if no password is provided.
+Otherwise, it is not possible to continue, because the UI is blocked.
+
+Resolves: rhbz#2121914
+---
+ simpleline/render/adv_widgets.py | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/simpleline/render/adv_widgets.py b/simpleline/render/adv_widgets.py
+index 781d2c5..58376ab 100644
+--- a/simpleline/render/adv_widgets.py
++++ b/simpleline/render/adv_widgets.py
+@@ -87,14 +87,13 @@ class PasswordDialog(UIScreen):
+             return None
+ 
+         self._password = handler.value
+-        if not self._password:
+-            return None
+-        else:
+-            # this may seem innocuous, but it's really a giant hack; we should
+-            # not be calling close() from prompt(), but the input handling code
+-            # in the TUI is such that without this very simple workaround, we
+-            # would be forever pelting users with a prompt to enter their pw
+-            self.close()
++
++        # this may seem innocuous, but it's really a giant hack; we should
++        # not be calling close() from prompt(), but the input handling code
++        # in the TUI is such that without this very simple workaround, we
++        # would be forever pelting users with a prompt to enter their pw
++        self.close()
++        return None
+ 
+     @property
+     def answer(self):
+-- 
+2.37.1
+
diff --git a/SPECS/python-simpleline.spec b/SPECS/python-simpleline.spec
index 993ea0f..64875dd 100644
--- a/SPECS/python-simpleline.spec
+++ b/SPECS/python-simpleline.spec
@@ -4,12 +4,14 @@ Name: python-%{srcname}
 Summary: A Python library for creating text UI
 Url: https://github.com/rhinstaller/python-%{srcname}
 Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 # This tarball was created from upstream git:
 #   git clone https://github.com/rhinstaller/python-simpleline
 #   cd python-simpleline && make archive
 Source0: https://github.com/rhinstaller/python-%{srcname}/archive/%{srcname}-%{version}.tar.gz
 
+Patch0: 0001-Always-close-the-password-dialog.patch
+
 License: GPLv2+
 BuildArch: noarch
 BuildRequires: python3-devel
@@ -41,6 +43,7 @@ Printed lines are never rewritten!
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p1
 
 %build
 %make_build
@@ -59,6 +62,10 @@ make test
 %{python3_sitelib}/*
 
 %changelog
+* Thu Sep 1 2022 Radek Vykydal <rvykydal@redhat.com> - 1.1.1-3
+- Always close the password dialog
+  Resolves: rhbz#2121914
+
 * Tue Aug 11 2020 Jiri Konecny <jkonecny@redhat.com> - 1.1.1-2
 - Fix file extension of gating.yaml