diff --git a/kstars/dialogs/focusdialog.cpp b/kstars/dialogs/focusdialog.cpp
index 479727bd0..3918bc94d 100644
--- a/kstars/dialogs/focusdialog.cpp
+++ b/kstars/dialogs/focusdialog.cpp
@@ -1,182 +1,206 @@
 /***************************************************************************
                           focusdialog.cpp  -  description
                              -------------------
     begin                : Sat Mar 23 2002
     copyright            : (C) 2002 by Jason Harris
     email                : kstars@30doradus.org
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "focusdialog.h"
 
 #include "dms.h"
 #include "kstars.h"
 #include "kstarsdata.h"
 #include "ksnotification.h"
 #include "skymap.h"
 #include "skyobjects/skypoint.h"
 
 #include <KLocalizedString>
 #include <QDoubleValidator>
 #include <KMessageBox>
 #include <QPushButton>
 
 #include <QVBoxLayout>
 
 FocusDialogUI::FocusDialogUI(QWidget *parent) : QFrame(parent)
 {
     setupUi(this);
 }
 
 FocusDialog::FocusDialog() : QDialog(KStars::Instance())
 {
 #ifdef Q_OS_OSX
     setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
 #endif
     //initialize point to the current focus position
     Point = SkyMap::Instance()->focus();
 
     fd = new FocusDialogUI(this);
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addWidget(fd);
     setLayout(mainLayout);
 
     setWindowTitle(i18n("Set Coordinates Manually"));
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     mainLayout->addWidget(buttonBox);
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(validatePoint()));
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
 
     okB = buttonBox->button(QDialogButtonBox::Ok);
     okB->setEnabled(false);
 
+    // When editing epoch, set JNow to false.
+    connect(fd->epochBox, &QLineEdit::editingFinished, [this]()
+    {
+        UseJNow = false;
+    });
+    fd->epochBox->setText(QString::number(KStarsData::Instance()->lt().epoch(), 'f', 3));
     fd->epochBox->setValidator(new QDoubleValidator(fd->epochBox));
     fd->raBox->setMinimumWidth(fd->raBox->fontMetrics().boundingRect("00h 00m 00s").width());
     fd->azBox->setMinimumWidth(fd->raBox->fontMetrics().boundingRect("00h 00m 00s").width());
 
     fd->raBox->setDegType(false); //RA box should be HMS-style
     fd->raBox->setFocus();        //set input focus
 
     SkyPoint *center {nullptr};
     if (SkyMap::Instance()->focusObject())
         center = dynamic_cast<SkyPoint*>(SkyMap::Instance()->focusObject());
     else
         center = SkyMap::Instance()->focusPoint();
 
     if (center)
     {
         center->deprecess(KStarsData::Instance()->updateNum());
-        fd->raBox->setDMS(center->ra0().toHMSString());
-        fd->decBox->setDMS(center->dec0().toDMSString());
+        fd->raBox->setDMS(center->ra().toHMSString());
+        fd->decBox->setDMS(center->dec().toDMSString());
 
         fd->azBox->setDMS(center->az().toDMSString());
         fd->altBox->setDMS(center->alt().toDMSString());
+
+        checkLineEdits();
     }
 
     connect(fd->raBox, SIGNAL(textChanged(QString)), this, SLOT(checkLineEdits()));
     connect(fd->decBox, SIGNAL(textChanged(QString)), this, SLOT(checkLineEdits()));
     connect(fd->azBox, SIGNAL(textChanged(QString)), this, SLOT(checkLineEdits()));
     connect(fd->altBox, SIGNAL(textChanged(QString)), this, SLOT(checkLineEdits()));
+
+    connect(fd->J2000B, &QPushButton::clicked, [this]()
+    {
+        fd->epochBox->setText("2000.0");
+        UseJNow = false;
+    });
+    connect(fd->JNowB, &QPushButton::clicked, [this]()
+    {
+        fd->epochBox->setText(QString::number(KStarsData::Instance()->lt().epoch(), 'f', 3));
+        UseJNow = true;
+    });
+
 }
 
 void FocusDialog::checkLineEdits()
 {
     bool raOk(false), decOk(false), azOk(false), altOk(false);
 
     fd->raBox->createDms(false, &raOk);
     fd->decBox->createDms(true, &decOk);
     fd->azBox->createDms(true, &azOk);
     fd->altBox->createDms(true, &altOk);
 
     if ((raOk && decOk) || (azOk && altOk))
         okB->setEnabled(true);
     else
         okB->setEnabled(false);
 }
 
 void FocusDialog::validatePoint()
 {
     bool raOk(false), decOk(false), azOk(false), altOk(false);
 
     //false means expressed in hours
     dms ra(fd->raBox->createDms(false, &raOk));
     dms dec(fd->decBox->createDms(true, &decOk));
 
     QString message;
 
     if (raOk && decOk)
     {
         //make sure values are in valid range
         if (ra.Hours() < 0.0 || ra.Hours() > 24.0)
             message = i18n("The Right Ascension value must be between 0.0 and 24.0.");
         if (dec.Degrees() < -90.0 || dec.Degrees() > 90.0)
             message += '\n' + i18n("The Declination value must be between -90.0 and 90.0.");
         if (!message.isEmpty())
         {
             KSNotification::sorry(message, i18n("Invalid Coordinate Data"));
             return;
         }
 
         Point->set(ra, dec);
         bool ok;
 
-        double epoch0   = KStarsDateTime::stringToEpoch(fd->epochBox->text(), ok);
-        long double jd0 = KStarsDateTime::epochToJd(epoch0);
-        Point->apparentCoord(jd0, KStarsData::Instance()->ut().djd());
+        if (!UseJNow)
+        {
+            double epoch0   = KStarsDateTime::stringToEpoch(fd->epochBox->text(), ok);
+            long double jd0 = KStarsDateTime::epochToJd(epoch0);
+            Point->apparentCoord(jd0, KStarsData::Instance()->ut().djd());
+        }
+
         Point->EquatorialToHorizontal(KStarsData::Instance()->lst(), KStarsData::Instance()->geo()->lat());
 
         QDialog::accept();
     }
     else
     {
         dms az(fd->azBox->createDms(true, &azOk));
         dms alt(fd->altBox->createDms(true, &altOk));
 
         if (azOk && altOk)
         {
             //make sure values are in valid range
             if (az.Degrees() < 0.0 || az.Degrees() > 360.0)
                 message = i18n("The Azimuth value must be between 0.0 and 360.0.");
             if (alt.Degrees() < -90.0 || alt.Degrees() > 90.0)
                 message += '\n' + i18n("The Altitude value must be between -90.0 and 90.0.");
             if (!message.isEmpty())
             {
                 KSNotification::sorry(message, i18n("Invalid Coordinate Data"));
                 return;
             }
 
             Point->setAz(az);
             Point->setAlt(alt);
             Point->HorizontalToEquatorial(KStarsData::Instance()->lst(), KStarsData::Instance()->geo()->lat());
 
             UsedAltAz = true;
 
             QDialog::accept();
         }
         else
         {
             QDialog::reject();
         }
     }
 }
 
 QSize FocusDialog::sizeHint() const
 {
-    return QSize(300, 210);
+    return QSize(350, 210);
 }
 
 void FocusDialog::activateAzAltPage() const
 {
     fd->fdTab->setCurrentWidget(fd->aaTab);
     fd->azBox->setFocus();
 }
diff --git a/kstars/dialogs/focusdialog.h b/kstars/dialogs/focusdialog.h
index 8fd64c23c..c8a22d211 100644
--- a/kstars/dialogs/focusdialog.h
+++ b/kstars/dialogs/focusdialog.h
@@ -1,78 +1,85 @@
 /***************************************************************************
                           focusdialog.h  -  description
                              -------------------
     begin                : Sat Mar 23 2002
     copyright            : (C) 2002 by Jason Harris
     email                : kstars@30doradus.org
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #pragma once
 
 #include "ui_focusdialog.h"
 
 #include <QDialog>
 
 class QPushButton;
 
 class SkyPoint;
 
 class FocusDialogUI : public QFrame, public Ui::FocusDialog
 {
-    Q_OBJECT
+        Q_OBJECT
 
-  public:
-    explicit FocusDialogUI(QWidget *parent = nullptr);
+    public:
+        explicit FocusDialogUI(QWidget *parent = nullptr);
 };
 
 /**
  * @class FocusDialog
  * @short A small dialog for setting the focus coordinates manually.
  *
  * @author Jason Harris
  * @version 1.0
  */
 class FocusDialog : public QDialog
 {
-    Q_OBJECT
-
-  public:
-    /** Constructor. */
-    FocusDialog();
-
-    /** @return pointer to the SkyPoint described by the entered RA, Dec */
-    inline SkyPoint *point() { return Point; }
-
-    /** @return suggested size of focus window. */
-    QSize sizeHint() const override;
-
-    /** @return whether user set the AltAz coords */
-    inline bool usedAltAz() const { return UsedAltAz; }
-
-    /** Show the Az/Alt page instead of the RA/Dec page. */
-    void activateAzAltPage() const;
-
-  public slots:
-    /** If text has been entered in both KLineEdits, enable the Ok button. */
-    void checkLineEdits();
-
-    /**
-     * Attempt to interpret the text in the KLineEdits as Ra and Dec values.
-   	 * If the point is validated, close the window.
-     */
-    void validatePoint();
-
-  private:
-    SkyPoint *Point { nullptr };
-    FocusDialogUI *fd { nullptr };
-    bool UsedAltAz { false };
-    QPushButton *okB { nullptr };
+        Q_OBJECT
+
+    public:
+        /** Constructor. */
+        FocusDialog();
+
+        /** @return pointer to the SkyPoint described by the entered RA, Dec */
+        inline SkyPoint *point()
+        {
+            return Point;
+        }
+
+        /** @return suggested size of focus window. */
+        QSize sizeHint() const override;
+
+        /** @return whether user set the AltAz coords */
+        inline bool usedAltAz() const
+        {
+            return UsedAltAz;
+        }
+
+        /** Show the Az/Alt page instead of the RA/Dec page. */
+        void activateAzAltPage() const;
+
+    public slots:
+        /** If text has been entered in both KLineEdits, enable the Ok button. */
+        void checkLineEdits();
+
+        /**
+         * Attempt to interpret the text in the KLineEdits as Ra and Dec values.
+         * If the point is validated, close the window.
+         */
+        void validatePoint();
+
+    private:
+        SkyPoint *Point { nullptr };
+        FocusDialogUI *fd { nullptr };
+        bool UsedAltAz { false };
+        QPushButton *okB { nullptr };
+        bool UseJNow { true };
 };
diff --git a/kstars/dialogs/focusdialog.ui b/kstars/dialogs/focusdialog.ui
index 7ecef3f11..642a54528 100644
--- a/kstars/dialogs/focusdialog.ui
+++ b/kstars/dialogs/focusdialog.ui
@@ -1,196 +1,247 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>FocusDialog</class>
  <widget class="QWidget" name="FocusDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>352</width>
-    <height>128</height>
+    <width>290</width>
+    <height>129</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
    <property name="spacing">
     <number>3</number>
    </property>
    <property name="leftMargin">
     <number>3</number>
    </property>
    <property name="topMargin">
     <number>3</number>
    </property>
    <property name="rightMargin">
     <number>3</number>
    </property>
    <property name="bottomMargin">
     <number>3</number>
    </property>
    <item>
     <widget class="QTabWidget" name="fdTab">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="rdTab">
       <attribute name="title">
        <string>RA/Dec</string>
       </attribute>
-      <layout class="QGridLayout">
-       <property name="leftMargin">
-        <number>3</number>
-       </property>
-       <property name="topMargin">
-        <number>3</number>
-       </property>
-       <property name="rightMargin">
-        <number>3</number>
-       </property>
-       <property name="bottomMargin">
-        <number>3</number>
-       </property>
-       <property name="spacing">
-        <number>3</number>
-       </property>
-       <item row="1" column="1">
-        <widget class="dmsBox" name="decBox">
-         <property name="clearButtonEnabled">
-          <bool>true</bool>
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="3" column="0">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="decLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Declination</string>
+         </property>
+         <property name="text">
+          <string>DE:</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="epochBox">
+       <item row="2" column="2">
+        <widget class="QPushButton" name="JNowB">
+         <property name="toolTip">
+          <string>Set Epoch to now</string>
+         </property>
          <property name="text">
-          <string>2000.0</string>
+          <string>JNow</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="raLabel">
+       <item row="2" column="3">
+        <widget class="QPushButton" name="J2000B">
+         <property name="toolTip">
+          <string>Set Epoch to J2000</string>
+         </property>
          <property name="text">
-          <string>New right ascension:</string>
+          <string>J2000</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="decLabel">
+       <item row="0" column="1" colspan="3">
+        <widget class="dmsBox" name="raBox">
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="raLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Right Ascension</string>
+         </property>
          <property name="text">
-          <string>New declination:</string>
+          <string>RA:</string>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="epochLabel">
          <property name="text">
           <string>Epoch:</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="dmsBox" name="raBox">
-         <property name="clearButtonEnabled">
-          <bool>true</bool>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="epochBox">
+         <property name="text">
+          <string>2000.0</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
+       <item row="1" column="1" colspan="3">
+        <widget class="dmsBox" name="decBox">
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
          </property>
-        </spacer>
+        </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="aaTab">
       <attribute name="title">
        <string>Az/Alt</string>
       </attribute>
-      <layout class="QGridLayout">
-       <property name="leftMargin">
-        <number>3</number>
-       </property>
-       <property name="topMargin">
-        <number>3</number>
-       </property>
-       <property name="rightMargin">
-        <number>3</number>
-       </property>
-       <property name="bottomMargin">
-        <number>3</number>
-       </property>
-       <property name="spacing">
-        <number>3</number>
-       </property>
-       <item row="1" column="0">
-        <widget class="QLabel" name="altLabel">
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Azimuth</string>
+         </property>
          <property name="text">
-          <string>New altitude:</string>
+          <string>Az:</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="azLabel">
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Altitude</string>
+         </property>
          <property name="text">
-          <string>New azimuth:</string>
+          <string>Alt:</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="dmsBox" name="altBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="clearButtonEnabled">
           <bool>true</bool>
          </property>
         </widget>
        </item>
+       <item row="2" column="1">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item row="0" column="1">
         <widget class="dmsBox" name="azBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="clearButtonEnabled">
           <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <spacer name="verticalSpacer">
+       <item row="0" column="2">
+        <spacer name="horizontalSpacer">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>40</width>
+           <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>dmsBox</class>
    <extends>QLineEdit</extends>
    <header>widgets/dmsbox.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>fdTab</tabstop>
   <tabstop>raBox</tabstop>
   <tabstop>decBox</tabstop>
   <tabstop>epochBox</tabstop>
   <tabstop>azBox</tabstop>
   <tabstop>altBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>