1 files changed, 9 insertions, 1 deletions

diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index b6ee16f..19a6675 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -282,13 +282,20 @@ void MainWindow::closeEvent( QCloseEvent* e ) {
         templateManager()->save();
         e->accept();
         QTimer::singleShot(0, qApp, SLOT(closeAllWindows()) );
     }
 }
 void MainWindow::slotItemNew() {
-    NewTaskDlg dlg( templateManager()->templates(), this );
+        QStringList templateList = templateManager()->templates();
+        if(templateList.isEmpty()) {
+                // No templates, just create a blank task
+                create();
+        }
+        else {
+                // There are templates, so allow the user to select one
+                NewTaskDlg dlg( templateList, this );
     if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) {
         QString tempName = dlg.tempSelected();
         if ( tempName.isNull() )
             // Create new, blank task
             create();
         else {
@@ -304,12 +311,13 @@ void MainWindow::slotItemNew() {
                 reloadCategories();
             }
             raiseCurrentView();
         }
     }
 }
+}
 void MainWindow::slotItemEdit() {
     slotEdit( currentView()->current() );
 }
 void MainWindow::slotItemDuplicate() {
     if(m_syncing) {
         QMessageBox::warning(this, QWidget::tr("Todo"),