diff --git a/asyncgit/src/sync/rebase.rs b/asyncgit/src/sync/rebase.rs
index 8fc289d03c..8040ee9650 100644
--- a/asyncgit/src/sync/rebase.rs
+++ b/asyncgit/src/sync/rebase.rs
@@ -69,7 +69,7 @@ pub fn conflict_free_rebase(
 }
 
 ///
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
 pub enum RebaseState {
 	///
 	Finished,
@@ -144,7 +144,7 @@ pub fn continue_rebase(
 }
 
 ///
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
 pub struct RebaseProgress {
 	///
 	pub steps: usize,
diff --git a/asyncgit/src/sync/status.rs b/asyncgit/src/sync/status.rs
index 345a64b2d1..d8ecdce458 100644
--- a/asyncgit/src/sync/status.rs
+++ b/asyncgit/src/sync/status.rs
@@ -12,7 +12,7 @@ use std::path::Path;
 use super::{RepoPath, ShowUntrackedFilesConfig};
 
 ///
-#[derive(Copy, Clone, Hash, PartialEq, Debug)]
+#[derive(Copy, Clone, Hash, PartialEq, Eq, Debug)]
 pub enum StatusItemType {
 	///
 	New,
@@ -59,7 +59,7 @@ impl From<Delta> for StatusItemType {
 }
 
 ///
-#[derive(Clone, Hash, PartialEq, Debug)]
+#[derive(Clone, Hash, PartialEq, Eq, Debug)]
 pub struct StatusItem {
 	///
 	pub path: String,
diff --git a/asyncgit/src/sync/utils.rs b/asyncgit/src/sync/utils.rs
index 58042a9d70..e977d6da7e 100644
--- a/asyncgit/src/sync/utils.rs
+++ b/asyncgit/src/sync/utils.rs
@@ -16,7 +16,7 @@ use std::{
 };
 
 ///
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub struct Head {
 	///
 	pub name: String,
diff --git a/filetreelist/src/item.rs b/filetreelist/src/item.rs
index cc6a75713d..482bd033ba 100644
--- a/filetreelist/src/item.rs
+++ b/filetreelist/src/item.rs
@@ -83,11 +83,11 @@ impl TreeItemInfo {
 }
 
 /// attribute used to indicate the collapse/expand state of a path item
-#[derive(PartialEq, Debug, Copy, Clone)]
+#[derive(PartialEq, Eq, Debug, Copy, Clone)]
 pub struct PathCollapsed(pub bool);
 
 /// `FileTreeItem` can be of two kinds
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub enum FileTreeItemKind {
 	Path(PathCollapsed),
 	File,
diff --git a/src/components/mod.rs b/src/components/mod.rs
index ca23fa230c..a67c4a6c64 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -192,7 +192,7 @@ pub enum Direction {
 }
 
 ///
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 pub enum CommandBlocking {
 	Blocking,
 	PassingOn,
@@ -220,7 +220,7 @@ pub trait DrawableComponent {
 }
 
 ///
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 pub enum EventState {
 	Consumed,
 	NotConsumed,
diff --git a/src/components/options_popup.rs b/src/components/options_popup.rs
index b99a46f66d..66a95090da 100644
--- a/src/components/options_popup.rs
+++ b/src/components/options_popup.rs
@@ -23,7 +23,7 @@ use tui::{
 	Frame,
 };
 
-#[derive(Clone, Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq, Eq)]
 pub enum AppOption {
 	StatusShowUntracked,
 	DiffIgnoreWhitespaces,
diff --git a/src/components/textinput.rs b/src/components/textinput.rs
index 69e098c7ac..829901b403 100644
--- a/src/components/textinput.rs
+++ b/src/components/textinput.rs
@@ -22,7 +22,7 @@ use tui::{
 	Frame,
 };
 
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 pub enum InputType {
 	Singleline,
 	Multiline,
diff --git a/src/components/utils/filetree.rs b/src/components/utils/filetree.rs
index 4b26825e83..8bf144f70d 100644
--- a/src/components/utils/filetree.rs
+++ b/src/components/utils/filetree.rs
@@ -39,11 +39,11 @@ impl TreeItemInfo {
 }
 
 /// attribute used to indicate the collapse/expand state of a path item
-#[derive(PartialEq, Debug, Copy, Clone)]
+#[derive(PartialEq, Eq, Debug, Copy, Clone)]
 pub struct PathCollapsed(pub bool);
 
 /// `FileTreeItem` can be of two kinds
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub enum FileTreeItemKind {
 	Path(PathCollapsed),
 	File(StatusItem),
diff --git a/src/main.rs b/src/main.rs
index 9f85240f69..948580d388 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -79,13 +79,13 @@ pub enum QueueEvent {
 	InputEvent(InputEvent),
 }
 
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum SyntaxHighlightProgress {
 	Progress,
 	Done,
 }
 
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum AsyncAppNotification {
 	///
 	SyntaxHighlighting(SyntaxHighlightProgress),
diff --git a/src/tabs/status.rs b/src/tabs/status.rs
index 65497f1250..eab8dda46c 100644
--- a/src/tabs/status.rs
+++ b/src/tabs/status.rs
@@ -32,7 +32,7 @@ use tui::{
 };
 
 /// what part of the screen is focused
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 enum Focus {
 	WorkDir,
 	Diff,
@@ -51,7 +51,7 @@ impl Focus {
 }
 
 /// which target are we showing a diff against
-#[derive(PartialEq, Copy, Clone)]
+#[derive(PartialEq, Eq, Copy, Clone)]
 enum DiffTarget {
 	Stage,
 	WorkingDir,