diff --git a/internal/glance/cli.go b/internal/glance/cli.go
index 5544b8bcb..813e502f4 100644
--- a/internal/glance/cli.go
+++ b/internal/glance/cli.go
@@ -86,11 +86,7 @@ func parseCliOptions() (*cliOptions, error) {
 	} else if len(args) == 2 {
 		if args[0] == "password:hash" {
 			intent = cliIntentPasswordHash
-		} else {
-			return nil, unknownCommandErr
-		}
-	} else if len(args) == 2 {
-		if args[0] == "mountpoint:info" {
+		} else if args[0] == "mountpoint:info" {
 			intent = cliIntentMountpointInfo
 		} else {
 			return nil, unknownCommandErr
diff --git a/internal/glance/glance.go b/internal/glance/glance.go
index 28771fa54..c30d2f91f 100644
--- a/internal/glance/glance.go
+++ b/internal/glance/glance.go
@@ -106,7 +106,7 @@ func newApplication(c *config) (*application, error) {
 		themeProps := make([]*themeProperties, 0, 2)
 
 		defaultDarkTheme, ok := config.Theme.Presets.Get("default-dark")
-		if ok && !config.Theme.SameAs(defaultDarkTheme) || !config.Theme.SameAs(&themeProperties{}) {
+		if ok && (!config.Theme.SameAs(defaultDarkTheme) || !config.Theme.SameAs(&themeProperties{})) {
 			themeKeys = append(themeKeys, "default-dark")
 			themeProps = append(themeProps, &themeProperties{})
 		}
@@ -168,7 +168,7 @@ func newApplication(c *config) (*application, error) {
 			page.Width = ""
 		}
 
-		if page.DesktopNavigationWidth == "" && page.DesktopNavigationWidth != "default" {
+		if page.DesktopNavigationWidth == "" || page.DesktopNavigationWidth == "default" {
 			page.DesktopNavigationWidth = page.Width
 		}