diff --git a/src/modes/Edit.cpp b/src/modes/Edit.cpp
index 7703bf0..4dff2b6 100644
--- a/src/modes/Edit.cpp
+++ b/src/modes/Edit.cpp
@@ -96,6 +96,14 @@ namespace groove {
 				case '$':
 					this->editor.x = this->editor.buffer->at(this->editor.y).size();
 					break;
+				case 'g':
+					this->editor.y = 0;
+					this->editor.offset = 0;
+					break;
+				case 'G':
+					this->editor.y = this->editor.buffer->size();
+					this->editor.offset = this->editor.buffer->size() - LINES + 2;
+					break;
 			}
 		}
 	}