diff --git a/src/gui/editmountpointdialog.cpp b/src/gui/editmountpointdialog.cpp
index 3e36567..75f6cfc 100644
--- a/src/gui/editmountpointdialog.cpp
+++ b/src/gui/editmountpointdialog.cpp
@@ -1,5 +1,6 @@
 /*************************************************************************
  *  Copyright (C) 2009, 2010 by Volker Lanz <vl@fidra.de>                *
+ *  Copyright (C) 2015 by Teo Mrnjavac <teo@kde.org>                     *
  *                                                                       *
  *  This program is free software; you can redistribute it and/or        *
  *  modify it under the terms of the GNU General Public License as       *
@@ -27,6 +28,8 @@
 #include <KConfigGroup>
 #include <KSharedConfig>
 
+#include <QDialogButtonBox>
+
 EditMountPointDialog::EditMountPointDialog(QWidget* parent, Partition& p) :
     QDialog(parent),
     m_Partition(p),
@@ -39,6 +42,15 @@ EditMountPointDialog::EditMountPointDialog(QWidget* parent, Partition& p) :
 
     KConfigGroup kcg(KSharedConfig::openConfig(), "editMountPointDialog");
     restoreGeometry(kcg.readEntry<QByteArray>("Geometry", QByteArray()));
+
+    QDialogButtonBox* dbb = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
+                                                  Qt::Horizontal,
+                                                  this );
+    mainLayout->addWidget(dbb);
+    connect(dbb, &QDialogButtonBox::accepted,
+            this, &EditMountPointDialog::accept);
+    connect(dbb, &QDialogButtonBox::rejected,
+            this, &EditMountPointDialog::reject);
 }
 
 /** Destroys an EditMOuntOptionsDialog instance */
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index f33a44b..70b625f 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -989,10 +989,10 @@ static KLocalizedString checkSupportInNode(const PartitionNode* parent)
             continue;
 
         if (node->children().size() > 0)
-            rval = kxi18n("%1 %2").subs(rval).subs(checkSupportInNode(node));
+            rval = kxi18n("%1%2").subs(rval).subs(checkSupportInNode(node));
 
         if (!p->fileSystem().supportToolFound() && !p->fileSystem().supportToolName().name.isEmpty())
-            rval = kxi18n("%1 %2").subs(rval).subs(kxi18n("<tr>"
+            rval = kxi18n("%1%2").subs(rval).subs(kxi18n("<tr>"
                                    "<td>%1</td>"
                                    "<td>%2</td>"
                                    "<td>%3</td>"
@@ -1014,9 +1014,9 @@ void MainWindow::checkFileSystemSupport()
 
     foreach(const Device * d, operationStack().previewDevices()) {
         supportInNode = checkSupportInNode(d->partitionTable());
-        if (!supportInNode.isEmpty()) {
+        if (supportInNode.toString() != QStringLiteral()) {
             missingSupportTools = true;
-            supportList = kxi18n("%1 %2").subs(supportList).subs(supportInNode);
+            supportList = kxi18n("%1%2").subs(supportList).subs(supportInNode);
         }
     }