diff --git a/TODO.todo b/TODO.todo
index 0db61e2a..665802c0 100644
--- a/TODO.todo
+++ b/TODO.todo
@@ -1,6 +1,3 @@
-TODO v.0.7:
- ☐ do not scroll preview when popover is open on the preview code
-
 Refactor:
  ☐ refactor routing
  ☐ refactor scopebar
@@ -132,6 +129,7 @@ Test:
  ☐ download theme
 ＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿
 Archive:
+ ✔ do not scroll preview when popover is open on the preview code @done (14-02-24 10:52) @project(TODO v.0.7)
  ✔ BUG: save does not work (gallery/local/external) @done (14-02-24 10:42) @project(TODO v.0.7)
  ✔ BUG: back when galerry is closed -> badly posisioned throbber @done (14-02-24 10:04)
  ✔ gutter issue (redo gutter styling) @done (14-02-24 09:48) @project(Preview and scope bar)
diff --git a/app/templates/_preview.ejs b/app/templates/_preview.ejs
index 6eb0f232..e69caea7 100644
--- a/app/templates/_preview.ejs
+++ b/app/templates/_preview.ejs
@@ -1,7 +1,7 @@
 <div ng-controller="previewController">
 
   <!-- preview  -->
-  <div ng-class="{ 'slide' : gallery_visible }" id="preview" class="preview" ng-style="{ 'background-color': Color.parse(Theme.bg()), 'color': Color.parse(Theme.fg()) }">
+  <div ng-class="{ 'slide': gallery_visible, 'no-scroll': EditPopover.visible  }" id="preview" class="preview" ng-style="{ 'background-color': Color.parse(Theme.bg()), 'color': Color.parse(Theme.fg()) }">
     <pre ng-show="Theme.json"
          ng-bind-html="colorized"
          ng-style="{ 'color': Color.parse(Theme.fg()) }"></preview>