diff --git a/gui.c b/gui.c
index d6eca83..db0a006 100644
--- a/gui.c
+++ b/gui.c
@@ -147,9 +147,11 @@ int update_general_memdump(struct simdata_t *simdata){
 	if(width<16){
 		mvwprintw(general_memdump,1,1,"too small window");
 	}else{
-		int n=(width-12)/4;
-		uint32_t ADDRESS=0;
-		for(int h=0;h<height-3;h++){
+		int n=(width-12)/4; // bytes in each line
+		int usable_height=height-3-(width-12)%2;
+
+		uint32_t ADDRESS=(simdata->PC-n*usable_height/2)&0x00FFFFFF;
+		for(int h=0;h<usable_height;h++){
 			wmove(general_memdump,h+2,2+(width-12)%2);
 			wprintw(general_memdump,"%06x  ",ADDRESS);
 			uint32_t temp_address=ADDRESS;
@@ -157,7 +159,7 @@ int update_general_memdump(struct simdata_t *simdata){
 				wprintw(general_memdump,"%02x ",simdata->RAM[temp_address++]);
 			for (int i=0;i<n;i++){
 				wprintw(general_memdump,"%c",(simdata->RAM[ADDRESS]>=0x20&&simdata->RAM[ADDRESS]<0x7F)?simdata->RAM[ADDRESS]:'.');
-				ADDRESS++;
+				ADDRESS=(ADDRESS+1)&0xFFFFFF;
 			}
 		}
 	}
diff --git a/simdata.c b/simdata.c
index 01f6f44..92e7b0f 100644
--- a/simdata.c
+++ b/simdata.c
@@ -36,6 +36,8 @@ struct simdata_t *init_simdata(){
 		return 0;
 	}
 
+	ret->PC=0;
+
 	return ret;
 }
 
diff --git a/simdata.h b/simdata.h
index d4d7439..8761597 100644
--- a/simdata.h
+++ b/simdata.h
@@ -4,6 +4,7 @@
 struct simdata_t{
 	long unsigned int current_clock;
 	uint8_t *RAM;
+	uint32_t PC;
 };
 
 struct simdata_t *init_simdata();