diff --git a/src/tools/ecode/plugins/git/gitplugin.cpp b/src/tools/ecode/plugins/git/gitplugin.cpp
index 9c064de95..5c395dcc7 100644
--- a/src/tools/ecode/plugins/git/gitplugin.cpp
+++ b/src/tools/ecode/plugins/git/gitplugin.cpp
@@ -1,5 +1,5 @@
-#include "gitplugin.hpp"
 #include "gitbranchmodel.hpp"
+#include "gitplugin.hpp"
 #include "gitstatusmodel.hpp"
 #include <eepp/graphics/primitives.hpp>
 #include <eepp/scene/scenemanager.hpp>
@@ -362,6 +362,10 @@ void GitPlugin::updateStatusBarSync() {
 		} );
 	}
 
+	if ( mStatusBar->getChildCount() >= 2 &&
+		 mStatusButton->getNodeIndex() != mStatusBar->getChildCount() - 2 )
+		mStatusButton->toPosition( mStatusBar->getChildCount() - 2 );
+
 	mStatusButton->setVisible( !mGit->getGitFolder().empty() );
 
 	if ( mGit->getGitFolder().empty() )