diff --git a/src/eval/eval_ir.c b/src/eval/eval_ir.c
index 01a93360..5575990d 100644
--- a/src/eval/eval_ir.c
+++ b/src/eval/eval_ir.c
@@ -2600,8 +2600,8 @@ e_append_oplist_from_irtree(Arena *arena, E_IRNode *root, E_Space *current_space
   U32 op = root->op;
   {
     E_Space zero_space = zero_struct;
-    if(!MemoryMatchStruct(&root->space, &zero_space) &&
-       !MemoryMatchStruct(&root->space, current_space))
+    if(!e_space_match(root->space, zero_space) &&
+       !e_space_match(root->space, *current_space))
     {
       *current_space = root->space;
       e_oplist_push_set_space(arena, out, root->space);
diff --git a/src/raddbg/raddbg_views.c b/src/raddbg/raddbg_views.c
index 82f01992..f9684933 100644
--- a/src/raddbg/raddbg_views.c
+++ b/src/raddbg/raddbg_views.c
@@ -2604,6 +2604,11 @@ RD_VIEW_UI_FUNCTION_DEF(memory)
   Vec4F32 main_tx_color_rgba = ui_color_from_name(str8_lit("text"));
   Vec4F32 main_tx_color_hsva = hsva_from_rgba(main_tx_color_rgba);
   F32 main_font_size = ui_bottom_font_size();
+  if(e_space_match(eval.space, e_base_ctx->thread_reg_space))
+  {
+    eval = e_value_eval_from_eval(eval);
+    eval.space = e_base_ctx->primary_module->space;
+  }
   Rng1U64 view_range = rd_space_range_from_eval(eval);
   if(eval.space.kind == 0)
   {