diff --git a/core/src/tableview3d.cpp b/core/src/tableview3d.cpp
index 6c58dc6..05f13eb 100644
--- a/core/src/tableview3d.cpp
+++ b/core/src/tableview3d.cpp
@@ -87,7 +87,10 @@ TableView3D::TableView3D(QWidget *parent)
 }
 void TableView3D::inputTimerTimeout()
 {
-	setRange(m_queuedValList);
+	if (!m_firstKeypress)
+	{
+		setRange(m_queuedValList);
+	}
 	m_inputTimer->stop();
 }
 
@@ -324,12 +327,14 @@ void TableView3D::hotKeyPressed(int key,Qt::KeyboardModifier modifier)
 			//Timer is already active, too soon!
 			//Let the table continue to increment... but don't fire off
 			m_queuedValList = vallist;
-			m_inputTimer->stop();
-			m_inputTimer->start(250);
+			m_firstKeypress = false;
+			//m_inputTimer->stop();
+			//m_inputTimer->start(250);
 		}
 		else
 		{
-			m_inputTimer->start(250);
+			m_firstKeypress = true;
+			m_inputTimer->start(350);
 			setRange(vallist);
 		}
 	}
@@ -412,11 +417,13 @@ void TableView3D::hotKeyPressed(int key,Qt::KeyboardModifier modifier)
 			//Timer is already active, too soon!
 			//Let the table continue to increment... but don't fire off
 			m_queuedValList = vallist;
-			m_inputTimer->stop();
-			m_inputTimer->start(250);
+			m_firstKeypress = false;
+			//m_inputTimer->stop();
+			//m_inputTimer->start(250);
 		}
 		else
 		{
+			m_firstKeypress = true;
 			m_inputTimer->start(250);
 			setRange(vallist);
 		}
diff --git a/core/src/tableview3d.h b/core/src/tableview3d.h
index 853f698..5ccbe65 100644
--- a/core/src/tableview3d.h
+++ b/core/src/tableview3d.h
@@ -42,6 +42,7 @@ class TableView3D : public DataView
 	bool setData(QString name,DataBlock *data);
 	void passDatalog(QVariantMap data);
 private:
+	bool m_firstKeypress;
 	QTimer *m_inputTimer;
 	void reColorTable(int rownum,int colnum);
 	QList<QPair<int,int> > m_highlightItemList;