diff --git a/libs/ui/KisTemplatesPane.cpp b/libs/ui/KisTemplatesPane.cpp
index 4c6824d1f2..b971016f89 100644
--- a/libs/ui/KisTemplatesPane.cpp
+++ b/libs/ui/KisTemplatesPane.cpp
@@ -1,197 +1,192 @@
 /* This file is part of the KDE project
    Copyright (C) 2005-2006 Peter Simonsson <psn@linux.se>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "KisTemplatesPane.h"
 
 #include "KisTemplateGroup.h"
 #include "KisTemplate.h"
 
 #include <QFileInfo>
 #include <QStandardItemModel>
 #include <QUrl>
 
 #include <kguiitem.h>
 #include <kconfiggroup.h>
 #include <ksharedconfig.h>
 
 class KisTemplatesPanePrivate
 {
 public:
     KisTemplatesPanePrivate()
         : m_selected(false) {
     }
 
     bool m_selected;
     QString m_alwaysUseTemplate;
 };
 
 
 KisTemplatesPane::KisTemplatesPane(QWidget* parent, const QString& header,
                                    KisTemplateGroup *group, KisTemplate* defaultTemplate)
     : KisDetailsPane(parent,header)
     , d(new KisTemplatesPanePrivate)
 {
     setFocusProxy(m_documentList);
 
     KGuiItem openGItem(i18n("Use This Template"));
     KGuiItem::assign(m_openButton, openGItem);
     KConfigGroup cfgGrp( KSharedConfig::openConfig(), "TemplateChooserDialog");
     QString fullTemplateName = cfgGrp.readPathEntry("FullTemplateName", QString());
 
 
     d->m_alwaysUseTemplate = cfgGrp.readPathEntry("AlwaysUseTemplate", QString());
     m_alwaysUseCheckBox->setVisible(false);
     connect(m_alwaysUseCheckBox, SIGNAL(clicked()), this, SLOT(alwaysUseClicked()));
 
     QStandardItem* selectItem = 0;
     QStandardItem* rootItem = model()->invisibleRootItem();
     QStandardItem* defaultItem = 0;
 
     QFileInfo templateFileInfo(fullTemplateName);
 
     Q_FOREACH (KisTemplate* t, group->templates()) {
         if (t->isHidden())
             continue;
 
         QPixmap preview = t->loadPicture();
         QImage icon = preview.toImage();
         icon = icon.scaled(IconExtent, IconExtent, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         icon = icon.convertToFormat(QImage::Format_ARGB32);
         icon = icon.copy((icon.width() - IconExtent) / 2, (icon.height() - IconExtent) / 2, IconExtent, IconExtent);
         QStandardItem* item = new QStandardItem(QPixmap::fromImage(icon), t->name());
         item->setEditable(false);
         item->setData(t->description(), Qt::UserRole);
         item->setData(t->file(), Qt::UserRole + 1);
         item->setData(preview, Qt::UserRole + 2);
         rootItem->appendRow(item);
 
-        if (d->m_alwaysUseTemplate == t->file()) {
-            selectItem = item;
-        }
-        else {
-            if (templateFileInfo.exists()) {
-                if (!selectItem && (t->file() == fullTemplateName)) {
-                    selectItem = item;
-                }
-            }
-            else {
-                if (!selectItem && QFileInfo(t->file()).fileName() == templateFileInfo.fileName()) {
-                    selectItem = item;
-                }
-            }
-        }
+		if (templateFileInfo.exists()) {
+			if (!selectItem && (t->file() == fullTemplateName)) {
+				selectItem = item;
+			}
+		}
+		else {
+			if (!selectItem && QFileInfo(t->file()).fileName() == templateFileInfo.fileName()) {
+				selectItem = item;
+			}
+		}
 
         if (defaultTemplate && (t->file() == defaultTemplate->file())) {
             defaultItem = item;
         }
     }
 
     QModelIndex selectedIndex;
 
     if (selectItem) {
         selectedIndex = model()->indexFromItem(selectItem);
         d->m_selected = true;
     } else if (defaultItem) {
         selectedIndex = model()->indexFromItem(defaultItem);
     } else {
         selectedIndex = model()->indexFromItem(model()->item(0));
     }
 
     m_documentList->selectionModel()->select(selectedIndex, QItemSelectionModel::Select);
     m_documentList->selectionModel()->setCurrentIndex(selectedIndex, QItemSelectionModel::Select);
 }
 
 KisTemplatesPane::~KisTemplatesPane()
 {
     delete d;
 }
 
 void KisTemplatesPane::selectionChanged(const QModelIndex& index)
 {
     if (index.isValid()) {
         QStandardItem* item = model()->itemFromIndex(index);
         m_openButton->setEnabled(true);
         m_alwaysUseCheckBox->setEnabled(true);
         m_titleLabel->setText(item->data(Qt::DisplayRole).toString());
         m_previewLabel->setPixmap(item->data(Qt::UserRole + 2).value<QPixmap>());
         m_detailsLabel->setHtml(item->data(Qt::UserRole).toString());
         m_alwaysUseCheckBox->setChecked(item->data(Qt::UserRole + 1).toString() == d->m_alwaysUseTemplate);
     } else {
         m_openButton->setEnabled(false);
         m_alwaysUseCheckBox->setEnabled(false);
         m_alwaysUseCheckBox->setChecked(false);
         m_titleLabel->clear();
         m_previewLabel->setPixmap(QPixmap());
         m_detailsLabel->clear();
     }
 }
 
 void KisTemplatesPane::openFile()
 {
     KisDetailsPane::openFile();
 }
 
 void KisTemplatesPane::openFile(const QModelIndex& index)
 {
     if (index.isValid()) {
         QStandardItem* item = model()->itemFromIndex(index);
         KConfigGroup cfgGrp( KSharedConfig::openConfig(), "TemplateChooserDialog");
         cfgGrp.writePathEntry("FullTemplateName", item->data(Qt::UserRole + 1).toString());
         cfgGrp.writeEntry("LastReturnType", "Template");
         cfgGrp.writeEntry("AlwaysUseTemplate", d->m_alwaysUseTemplate);
         emit openUrl(QUrl::fromLocalFile(item->data(Qt::UserRole + 1).toString()));
     }
 }
 
 bool KisTemplatesPane::isSelected()
 {
     return d->m_selected;
 }
 
 void KisTemplatesPane::alwaysUseClicked()
 {
     QStandardItem* item = model()->itemFromIndex(m_documentList->selectionModel()->currentIndex());
 
     if (!m_alwaysUseCheckBox->isChecked()) {
         d->m_alwaysUseTemplate.clear();
     } else {
         d->m_alwaysUseTemplate = item->data(Qt::UserRole + 1).toString();
     }
 
     KConfigGroup cfgGrp( KSharedConfig::openConfig(), "TemplateChooserDialog");
     cfgGrp.writeEntry("AlwaysUseTemplate", d->m_alwaysUseTemplate);
     cfgGrp.sync();
     emit alwaysUseChanged(this, d->m_alwaysUseTemplate);
 }
 
 void KisTemplatesPane::changeAlwaysUseTemplate(KisTemplatesPane* sender, const QString& alwaysUse)
 {
     if (this == sender)
         return;
 
     QStandardItem* item = model()->itemFromIndex(m_documentList->selectionModel()->currentIndex());
 
     // If the old always use template is selected uncheck the checkbox
     if (item && (item->data(Qt::UserRole + 1).toString() == d->m_alwaysUseTemplate)) {
         m_alwaysUseCheckBox->setChecked(false);
     }
 
     d->m_alwaysUseTemplate = alwaysUse;
 }