diff --git a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
index 9247c1d0..7cd33d7b 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
@@ -61,6 +61,8 @@ public class CommitDetailFragment extends Fragment {
 
 		super.onCreateView(inflater, container, savedInstanceState);
 
+		if(binding != null) return binding.getRoot();
+
 		binding = FragmentCommitDetailsBinding.inflate(getLayoutInflater(), container, false);
 
 		RepositoryContext repository = RepositoryContext.fromIntent(requireActivity().getIntent());
@@ -125,7 +127,7 @@ public class CommitDetailFragment extends Fragment {
 			public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
 
 				checkLoading();
-				Toasty.error(requireContext(), getString(R.string.genericError));
+				if(getContext() != null) Toasty.error(requireContext(), getString(R.string.genericError));
 			}
 		});
 	}
@@ -229,8 +231,10 @@ public class CommitDetailFragment extends Fragment {
 				public void onFailure(@NonNull Call<Commit> call, @NonNull Throwable t) {
 
 					checkLoading();
-					Toasty.error(requireContext(), getString(R.string.genericError));
-					requireActivity().finish();
+					if(getContext() != null) {
+						Toasty.error(requireContext(), getString(R.string.genericError));
+						requireActivity().finish();
+					}
 				}
 			});
 	}
diff --git a/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java
index 1cc0e237..80dcd3af 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java
@@ -39,6 +39,11 @@ public class DiffFilesFragment extends Fragment {
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
+		if(binding != null) {
+			ctx = requireContext();
+			return binding.getRoot();
+		}
+
 		binding = FragmentDiffFilesBinding.inflate(inflater, container, false);
 		ctx = requireContext();
 		IssueContext issue = IssueContext.fromIntent(requireActivity().getIntent());