diff --git a/source/Commands/CommandObjectFrame.cpp b/source/Commands/CommandObjectFrame.cpp
index 28ac841..4790eef 100644
--- a/source/Commands/CommandObjectFrame.cpp
+++ b/source/Commands/CommandObjectFrame.cpp
@@ -248,6 +248,12 @@
                     const char *frame_idx_cstr = command.GetArgumentAtIndex(0);
                     frame_idx = Args::StringToUInt32 (frame_idx_cstr, UINT32_MAX, 0);
                 }
+                if (command.GetArgumentCount() == 0)
+                {
+                    frame_idx = thread->GetSelectedFrameIndex ();
+                    if (frame_idx == UINT32_MAX)
+                        frame_idx = 0;
+                }
                 else
                 {
                     result.AppendError ("invalid arguments.\n");