diff --git a/pkg/commands/git.go b/pkg/commands/git.go
index fa1a731576b..3bda46ee351 100644
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -906,10 +906,8 @@ func (c *GitCommand) DiscardOldFileChanges(commits []*Commit, commitIndex int, f
 		if err := c.StageFile(fileName); err != nil {
 			return err
 		}
-	} else {
-		if err := c.CheckoutFile("HEAD^", fileName); err != nil {
-			return err
-		}
+	} else if err := c.CheckoutFile("HEAD^", fileName); err != nil {
+		return err
 	}
 
 	// amend the commit
diff --git a/pkg/gui/theme.go b/pkg/gui/theme.go
index dbc8b904b1b..1f87e325ede 100644
--- a/pkg/gui/theme.go
+++ b/pkg/gui/theme.go
@@ -31,7 +31,7 @@ func (gui *Gui) GetAttribute(key string) gocui.Attribute {
 func (gui *Gui) GetColor(keys []string) gocui.Attribute {
 	var attribute gocui.Attribute
 	for _, key := range keys {
-		attribute = attribute | gui.GetAttribute(key)
+		attribute |= gui.GetAttribute(key)
 	}
 	return attribute
 }