diff --git a/NEWS b/NEWS
index 4343859a..266ff86b 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ v0.7.1 (xxxx-xx-xx)
 - Zones in find zones menu can be now grouped by zone name.
 - Vulkan and D3D12 GPU contexts can be now calibrated.
 - Added CSV export utility.
+- "Go to frame" popup no longer has a dedicated button. To show it, click on
+  the frame counter.
 
 v0.7 (2020-06-11)
 -----------------
diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 2544ac73..ec5e3a26 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -616,6 +616,7 @@ bool View::DrawImpl()
         {
             ImGui::PopStyleColor();
         }
+        if( ImGui::IsItemClicked() ) ImGui::OpenPopup( "GoToFramePopup" );
     }
     ImGui::SameLine();
     if( ImGui::SmallButton( " " ICON_FA_CARET_RIGHT " " ) ) ZoomToNextFrame();
@@ -639,14 +640,6 @@ bool View::DrawImpl()
         }
         ImGui::EndCombo();
     }
-    ImGui::SameLine();
-    if( ImGui::Button( ICON_FA_CROSSHAIRS ) ) ImGui::OpenPopup( "GoToFramePopup" );
-    if( ImGui::IsItemHovered() )
-    {
-        ImGui::BeginTooltip();
-        ImGui::TextUnformatted( "Go to frame" );
-        ImGui::EndTooltip();
-    }
     if( ImGui::BeginPopup( "GoToFramePopup" ) )
     {
         static int frameNum = 1;