diff --git a/TODO b/TODO
index e1abddecc..5657ca1b4 100644
--- a/TODO
+++ b/TODO
@@ -82,6 +82,7 @@ beta5->beta6 changelog:
 - BUGFIX: Showing checking progress for paused torrents too
 - BUGFIX: Fixed progress column sorting on startup
 - BUGFIX: Prevent downloadFromUrl flooding
+- BUGFIX: Fixed pause state toggle for paused and checking torrents
 - BUGFIX: Made finished list context menu more similar to the download list one
 - BUGFIX: Fixed Pause/Start action in lists context menus
 - BUGFIX: Improved ETA calculation
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 16468bfb1..e7cee4fd2 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -150,6 +150,8 @@ bool bittorrent::isPaused(QString hash) const{
     qDebug("/!\\ Error: Invalid handle");
     return true;
   }
+  if(torrentsToPauseAfterChecking.contains(hash))
+    return true;
   return h.is_paused();
 }