diff --git a/file.c b/file.c
index 0b546c91f7..b83bd27138 100644
--- a/file.c
+++ b/file.c
@@ -1623,10 +1623,6 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, gb
     cf->redissecting = TRUE;
 
     /* 'reset' dissection session */
-    if (cf->edt) {
-      epan_dissect_free(cf->edt);
-      cf->edt = NULL;
-    }
     epan_free(cf->epan);
     cf->epan = ws_epan_new(cf);
     cf->cinfo.epan = cf->epan;
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 689feaee22..abd15ef298 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -1265,7 +1265,7 @@ void MainWindow::setMenusForSelectedTreeRow(field_info *fi) {
 
         bool enable = false;
         QString filter;
-        if (capture_file_.capFile() && capture_file_.capFile()->edt) {
+        if (fi && capture_file_.capFile() && capture_file_.capFile()->edt) {
             enable = conv_filter->is_filter_valid(&capture_file_.capFile()->edt->pi);
             filter = conv_filter->build_filter_string(&capture_file_.capFile()->edt->pi);
         }