diff --git a/internal/serverutil/server.go b/internal/serverutil/server.go
index 1a07805d..6542194e 100644
--- a/internal/serverutil/server.go
+++ b/internal/serverutil/server.go
@@ -72,7 +72,7 @@ func redirectInternetEventsToOneChannel(l listener.Listener) (isInternetOn chan
 const (
 	recheckPortAfter    = 50 * time.Millisecond
 	stopPortChecksAfter = 15 * time.Second
-	retryListnerAfter   = 5 * time.Second
+	retryListenerAfter  = 5 * time.Second
 )
 
 func monitorInternetConnection(s Server, l listener.Listener) {
@@ -89,7 +89,7 @@ func monitorInternetConnection(s Server, l listener.Listener) {
 				// blocked our port for a bit after we closed IMAP server
 				// due to connection issues.
 				// Restart always helped, so we do retry to not bother user.
-				s.ListenRetryAndServe(10, retryListnerAfter)
+				s.ListenRetryAndServe(10, retryListenerAfter)
 			}()
 			expectedIsPortFree = false
 		} else {
diff --git a/pkg/listener/listener.go b/pkg/listener/listener.go
index 32d91561..48164d87 100644
--- a/pkg/listener/listener.go
+++ b/pkg/listener/listener.go
@@ -90,7 +90,7 @@ func (l *listener) Add(eventName string, channel chan<- string) {
 
 	log := log.WithField("name", eventName).WithField("i", len(l.channels[eventName]))
 	l.channels[eventName] = append(l.channels[eventName], channel)
-	log.Debug("Added event listner")
+	log.Debug("Added event listener")
 }
 
 // Remove removes an event listener.