diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.test.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.test.tsx
index 2fc2e330276..3288b4fa7ee 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.test.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.test.tsx
@@ -96,10 +96,28 @@ describe('SharePublic', () => {
     await screen.findByText('Welcome to Grafana public dashboards alpha!');
   });
 
-  // test when checkboxes show up
-  // test checkboxes hidden
-  // test url hidden
-  // test url shows up
-  //
+  it('renders default time in inputs', async () => {
+    config.featureToggles.publicDashboards = true;
+    const mockDashboard = new DashboardModel({
+      uid: 'mockDashboardUid',
+    });
+    const mockPanel = new PanelModel({
+      id: 'mockPanelId',
+    });
+
+    expect(mockDashboard.time).toEqual({ from: 'now-6h', to: 'now' });
+    //@ts-ignore
+    mockDashboard.originalTime = { from: 'test-from', to: 'test-to' };
+
+    render(<ShareModal panel={mockPanel} dashboard={mockDashboard} onDismiss={() => {}} />);
+
+    await waitFor(() => screen.getByText('Link'));
+    fireEvent.click(screen.getByText('Public Dashboard'));
+
+    await screen.findByText('Welcome to Grafana public dashboards alpha!');
+    expect(screen.getByDisplayValue('test-from')).toBeInTheDocument();
+    expect(screen.getByDisplayValue('test-to')).toBeInTheDocument();
+  });
+
   // test checking if current version of dashboard in state is persisted to db
 });
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx
index 6c42a952944..cd6146deede 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx
@@ -164,14 +164,14 @@ export const SharePublicDashboard = (props: Props) => {
               <br />
               <div style={{ padding: '5px' }}>
                 <Input
-                  value={props.dashboard.time.from}
+                  value={props.dashboard.getDefaultTime().from}
                   disabled={true}
                   addonBefore={
                     <span style={{ width: '50px', display: 'flex', alignItems: 'center', padding: '5px' }}>From:</span>
                   }
                 />
                 <Input
-                  value={props.dashboard.time.to}
+                  value={props.dashboard.getDefaultTime().to}
                   disabled={true}
                   addonBefore={
                     <span style={{ width: '50px', display: 'flex', alignItems: 'center', padding: '5px' }}>To:</span>