diff --git a/src/main/java/ctbrec/recorder/LocalRecorder.java b/src/main/java/ctbrec/recorder/LocalRecorder.java
index dfa3093d..15c63e69 100644
--- a/src/main/java/ctbrec/recorder/LocalRecorder.java
+++ b/src/main/java/ctbrec/recorder/LocalRecorder.java
@@ -558,7 +558,9 @@ public class LocalRecorder implements Recorder {
             if (models.contains(model)) {
                 int index = models.indexOf(model);
                 models.get(index).setSuspended(true);
+                model.setSuspended(true);
             } else {
+                LOG.warn("Couldn't suspend model {}. Not found in list", model.getName());
                 return;
             }
         } finally {
@@ -581,7 +583,9 @@ public class LocalRecorder implements Recorder {
                 Model m = models.get(index);
                 m.setSuspended(false);
                 startRecordingProcess(m);
+                model.setSuspended(false);
             } else {
+                LOG.warn("Couldn't resume model {}. Not found in list", model.getName());
                 return;
             }
         } finally {
diff --git a/src/main/java/ctbrec/ui/ThumbOverviewTab.java b/src/main/java/ctbrec/ui/ThumbOverviewTab.java
index 54a14e64..b7e8a7f2 100644
--- a/src/main/java/ctbrec/ui/ThumbOverviewTab.java
+++ b/src/main/java/ctbrec/ui/ThumbOverviewTab.java
@@ -394,7 +394,10 @@ public class ThumbOverviewTab extends Tab implements TabSelectionListener {
         contextMenu.setAutoHide(true);
         contextMenu.setHideOnEscape(true);
         contextMenu.setAutoFix(true);
-        contextMenu.getItems().addAll(openInPlayer, startStop, pauseResume);
+        contextMenu.getItems().addAll(openInPlayer, startStop);
+        if(recorder.isRecording(cell.getModel())) {
+            contextMenu.getItems().add(pauseResume);
+        }
         if(site.supportsFollow()) {
             MenuItem followOrUnFollow = (this instanceof FollowedTab) ? unfollow : follow;
             followOrUnFollow.setDisable(!site.credentialsAvailable());