1 files changed, 10 insertions, 6 deletions

diff --git a/src/ui/main_window/MainWindowSlotUI.cpp b/src/ui/main_window/MainWindowSlotUI.cpp
index 8ee09f64..189ead53 100644
--- a/src/ui/main_window/MainWindowSlotUI.cpp
+++ b/src/ui/main_window/MainWindowSlotUI.cpp
@@ -63,10 +63,8 @@ void MainWindow::slotCheckAttachmentFolder() {
 }
 
 void MainWindow::slotImportKeyFromEdit() {
-    if (edit->tabCount() == 0 || edit->slotCurPage() == 0) {
+    if (edit->tabCount() == 0 || edit->slotCurPageTextEdit() == nullptr)
         return;
-    }
-
     keyMgmt->slotImportKeys(edit->curTextPage()->toPlainText().toUtf8());
 }
 
@@ -88,6 +86,10 @@ void MainWindow::slotDisableTabActions(int number) {
     else
         disable = false;
 
+    if(edit->curFilePage() != nullptr) {
+        disable = true;
+    }
+
     printAct->setDisabled(disable);
     saveAct->setDisabled(disable);
     saveAsAct->setDisabled(disable);
@@ -101,7 +103,9 @@ void MainWindow::slotDisableTabActions(int number) {
     verifyAct->setDisabled(disable);
     signAct->setDisabled(disable);
     encryptAct->setDisabled(disable);
+    encryptSignAct->setDisabled(disable);
     decryptAct->setDisabled(disable);
+    decryptVerifyAct->setDisabled(disable);
 
     redoAct->setDisabled(disable);
     undoAct->setDisabled(disable);
@@ -163,7 +167,7 @@ void MainWindow::slotOpenSettingsDialog() {
 }
 
 void MainWindow::slotCleanDoubleLinebreaks() {
-    if (edit->tabCount() == 0 || edit->slotCurPage() == nullptr) {
+    if (edit->tabCount() == 0 || edit->slotCurPageTextEdit() == nullptr) {
         return;
     }
 
@@ -173,7 +177,7 @@ void MainWindow::slotCleanDoubleLinebreaks() {
 }
 
 void MainWindow::slotAddPgpHeader() {
-    if (edit->tabCount() == 0 || edit->slotCurPage() == nullptr) {
+    if (edit->tabCount() == 0 || edit->slotCurPageTextEdit() == nullptr) {
         return;
     }
 
@@ -187,7 +191,7 @@ void MainWindow::slotAddPgpHeader() {
 
 void MainWindow::slotCutPgpHeader() {
 
-    if (edit->tabCount() == 0 || edit->slotCurPage() == nullptr) {
+    if (edit->tabCount() == 0 || edit->slotCurPageTextEdit() == nullptr) {
         return;
     }