diff --git a/share/qtcreator/templates/qt4project/widget.ui b/share/qtcreator/templates/qt4project/widget.ui
index f4e94939e46edcd6e9cecf706a21a2947c3de60a..a804f2044eb4fa69dd5833134fcf3a29e9f5cba3 100644
--- a/share/qtcreator/templates/qt4project/widget.ui
+++ b/share/qtcreator/templates/qt4project/widget.ui
@@ -1,5 +1,5 @@
 <ui version="4.0">
- <class>%CLASS%Class</class>
+ <class>%CLASS%</class>
  <widget class="%BASECLASS%" name="%CLASS%" >
   <property name="geometry" >
    <rect>
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 8baabe03a2afc0de8d46ada86202dedff17735c2..c7558f1a18f9ce111512e6f0b10e8a3e76ea4449 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -235,9 +235,9 @@ void GitClient::diff(const QString &workingDirectory,
     if (Git::Constants::debug)
         qDebug() << "diff" << workingDirectory << fileName;
     QStringList arguments;
-    arguments << QLatin1String("diff");
+    arguments << QLatin1String("diff") << QLatin1String(noColorOption);
     if (!fileName.isEmpty())
-        arguments << diffArgs << QLatin1String(noColorOption) << QLatin1String("--") << fileName;
+        arguments << diffArgs  << QLatin1String("--") << fileName;
 
     const QString kind = QLatin1String(Git::Constants::GIT_DIFF_EDITOR_KIND);
     const QString title = tr("Git Diff %1").arg(fileName);